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
=== modified file 'packages/rpm/CentOS/5/openvista-gtm-integration.spec'
--- packages/rpm/CentOS/5/openvista-gtm-integration.spec 2010-04-01 03:09:42 +0000
+++ packages/rpm/CentOS/5/openvista-gtm-integration.spec 2010-04-01 19:24:24 +0000
@@ -19,6 +19,7 @@
19Source0: openvista-gtm-integration-%{version}.tar.bz219Source0: openvista-gtm-integration-%{version}.tar.bz2
20Source1: webdav.conf20Source1: webdav.conf
21Source2: openvista21Source2: openvista
22Patch1: openvista-gtm-integration_chkconfig.patch
22BuildRoot: %{_tmppath}/%{name}-root23BuildRoot: %{_tmppath}/%{name}-root
2324
24%description25%description
@@ -28,6 +29,7 @@
2829
29%prep30%prep
30%setup31%setup
32%patch1 -p0
3133
32%build34%build
33cd src/libopenvista35cd src/libopenvista
3436
=== added file 'packages/rpm/CentOS/5/openvista-gtm-integration_chkconfig.patch'
--- packages/rpm/CentOS/5/openvista-gtm-integration_chkconfig.patch 1970-01-01 00:00:00 +0000
+++ packages/rpm/CentOS/5/openvista-gtm-integration_chkconfig.patch 2010-04-01 19:24:24 +0000
@@ -0,0 +1,36 @@
1--- scripts/etc/init.d/openvista 2010-03-31 20:13:12.465666412 -0700
2+++ scripts/etc/init.d/openvista.new 2010-03-31 20:43:59.215582465 -0700
3@@ -19,15 +19,6 @@
4 #
5 # chkconfig: - 98 01
6 # description: Application-level startup/shutdown script for OpenVista Server
7-#
8-### BEGIN INIT INFO
9-# Provides: openvista
10-# Required-Start: $all openvista-databases
11-# Required-Stop: $all openvista-databases
12-# Default-Start: 2 3 4 5
13-# Default-Stop: 0 1 6
14-# Short-Description: Application-level startup/shutdown script for OpenVista Server
15-### END INIT INFO
16
17
18 # Copyright (C) 2009 Medsphere Systems Corporation
19--- scripts/etc/init.d/openvista-databases 2010-03-31 20:13:18.255601866 -0700
20+++ scripts/etc/init.d/openvista-databases.new 2010-03-31 20:43:47.785582841 -0700
21@@ -26,15 +26,6 @@
22 #
23 # chkconfig: - 50 30
24 # description: Database-level startup/shutdown script for OpenVista Server
25-#
26-### BEGIN INIT INFO
27-# Provides: openvista-databases
28-# Required-Start: $local_fs $syslog $time
29-# Required-Stop: $local_fs $syslog $time
30-# Default-Start: 2 3 4 5
31-# Default-Stop: 0 1 6
32-# Short-Description: Database-level startup/shutdown script for OpenVista Server
33-### END INIT INFO
34
35
36 # Copyright (C) 2009 Medsphere Systems Corporation
037
=== modified file 'scripts/etc/init.d/openvista'
--- scripts/etc/init.d/openvista 2009-12-04 21:07:51 +0000
+++ scripts/etc/init.d/openvista 2010-04-01 19:24:24 +0000
@@ -17,7 +17,7 @@
17#17#
18# See <http://medsphere.org/community/project/gtm/blog/2009/04/07/system-boot-tasks>18# See <http://medsphere.org/community/project/gtm/blog/2009/04/07/system-boot-tasks>
19#19#
20# chkconfig: 2345 98 0120# chkconfig: - 98 01
21# description: Application-level startup/shutdown script for OpenVista Server21# description: Application-level startup/shutdown script for OpenVista Server
22#22#
23### BEGIN INIT INFO23### BEGIN INIT INFO
2424
=== modified file 'scripts/etc/init.d/openvista-databases'
--- scripts/etc/init.d/openvista-databases 2009-12-04 21:07:51 +0000
+++ scripts/etc/init.d/openvista-databases 2010-04-01 19:24:24 +0000
@@ -24,7 +24,7 @@
24#24#
25# See <http://medsphere.org/community/project/gtm/blog/2009/04/07/system-boot-tasks>25# See <http://medsphere.org/community/project/gtm/blog/2009/04/07/system-boot-tasks>
26#26#
27# chkconfig: 2345 50 3027# chkconfig: - 50 30
28# description: Database-level startup/shutdown script for OpenVista Server28# description: Database-level startup/shutdown script for OpenVista Server
29#29#
30### BEGIN INIT INFO30### BEGIN INIT INFO

Subscribers

People subscribed via source and target branches