Merge lp:~jontai/openvista-gtm-integration/bug553001 into lp:openvista-gtm-integration

Proposed by Jon Tai
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jontai/openvista-gtm-integration/bug553001
Merge into: lp:openvista-gtm-integration
Diff against target: 86 lines (+40/-2)
4 files modified
packages/rpm/CentOS/5/openvista-gtm-integration.spec (+2/-0)
packages/rpm/CentOS/5/openvista-gtm-integration_chkconfig.patch (+36/-0)
scripts/etc/init.d/openvista (+1/-1)
scripts/etc/init.d/openvista-databases (+1/-1)
To merge this branch: bzr merge lp:~jontai/openvista-gtm-integration/bug553001
Reviewer Review Type Date Requested Status
jeff.apple Approve
Review via email: mp+22653@code.launchpad.net
To post a comment you must log in.
Revision history for this message
jeff.apple (jeff-apple) wrote :

I'm approving this, but I'm not knowledgeable about this stuff to have that mean a whole lot. I do not see any glaring errors.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'packages/rpm/CentOS/5/openvista-gtm-integration.spec'
2--- packages/rpm/CentOS/5/openvista-gtm-integration.spec 2010-04-01 03:09:42 +0000
3+++ packages/rpm/CentOS/5/openvista-gtm-integration.spec 2010-04-01 19:24:24 +0000
4@@ -19,6 +19,7 @@
5 Source0: openvista-gtm-integration-%{version}.tar.bz2
6 Source1: webdav.conf
7 Source2: openvista
8+Patch1: openvista-gtm-integration_chkconfig.patch
9 BuildRoot: %{_tmppath}/%{name}-root
10
11 %description
12@@ -28,6 +29,7 @@
13
14 %prep
15 %setup
16+%patch1 -p0
17
18 %build
19 cd src/libopenvista
20
21=== added file 'packages/rpm/CentOS/5/openvista-gtm-integration_chkconfig.patch'
22--- packages/rpm/CentOS/5/openvista-gtm-integration_chkconfig.patch 1970-01-01 00:00:00 +0000
23+++ packages/rpm/CentOS/5/openvista-gtm-integration_chkconfig.patch 2010-04-01 19:24:24 +0000
24@@ -0,0 +1,36 @@
25+--- scripts/etc/init.d/openvista 2010-03-31 20:13:12.465666412 -0700
26++++ scripts/etc/init.d/openvista.new 2010-03-31 20:43:59.215582465 -0700
27+@@ -19,15 +19,6 @@
28+ #
29+ # chkconfig: - 98 01
30+ # description: Application-level startup/shutdown script for OpenVista Server
31+-#
32+-### BEGIN INIT INFO
33+-# Provides: openvista
34+-# Required-Start: $all openvista-databases
35+-# Required-Stop: $all openvista-databases
36+-# Default-Start: 2 3 4 5
37+-# Default-Stop: 0 1 6
38+-# Short-Description: Application-level startup/shutdown script for OpenVista Server
39+-### END INIT INFO
40+
41+
42+ # Copyright (C) 2009 Medsphere Systems Corporation
43+--- scripts/etc/init.d/openvista-databases 2010-03-31 20:13:18.255601866 -0700
44++++ scripts/etc/init.d/openvista-databases.new 2010-03-31 20:43:47.785582841 -0700
45+@@ -26,15 +26,6 @@
46+ #
47+ # chkconfig: - 50 30
48+ # description: Database-level startup/shutdown script for OpenVista Server
49+-#
50+-### BEGIN INIT INFO
51+-# Provides: openvista-databases
52+-# Required-Start: $local_fs $syslog $time
53+-# Required-Stop: $local_fs $syslog $time
54+-# Default-Start: 2 3 4 5
55+-# Default-Stop: 0 1 6
56+-# Short-Description: Database-level startup/shutdown script for OpenVista Server
57+-### END INIT INFO
58+
59+
60+ # Copyright (C) 2009 Medsphere Systems Corporation
61
62=== modified file 'scripts/etc/init.d/openvista'
63--- scripts/etc/init.d/openvista 2009-12-04 21:07:51 +0000
64+++ scripts/etc/init.d/openvista 2010-04-01 19:24:24 +0000
65@@ -17,7 +17,7 @@
66 #
67 # See <http://medsphere.org/community/project/gtm/blog/2009/04/07/system-boot-tasks>
68 #
69-# chkconfig: 2345 98 01
70+# chkconfig: - 98 01
71 # description: Application-level startup/shutdown script for OpenVista Server
72 #
73 ### BEGIN INIT INFO
74
75=== modified file 'scripts/etc/init.d/openvista-databases'
76--- scripts/etc/init.d/openvista-databases 2009-12-04 21:07:51 +0000
77+++ scripts/etc/init.d/openvista-databases 2010-04-01 19:24:24 +0000
78@@ -24,7 +24,7 @@
79 #
80 # See <http://medsphere.org/community/project/gtm/blog/2009/04/07/system-boot-tasks>
81 #
82-# chkconfig: 2345 50 30
83+# chkconfig: - 50 30
84 # description: Database-level startup/shutdown script for OpenVista Server
85 #
86 ### BEGIN INIT INFO

Subscribers

People subscribed via source and target branches