OpenVista/GT.M Integration

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

  1. bug389047
  2. Merge into mainline
Proposed by Jon Tai
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jontai/openvista-gtm-integration/bug389047
Merge into: lp:openvista-gtm-integration
Diff against target: None lines
To merge this branch: bzr merge lp:~jontai/openvista-gtm-integration/bug389047
Reviewer Review Type Date Requested Status
jeff.apple Approve
Review via email: mp+7632@code.launchpad.net
To post a comment you must log in.
Revision history for this message
jeff.apple (jeff-apple) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'packages/rpm/openvista-libs-5.3003.spec'
2--- packages/rpm/openvista-libs-5.3003.spec 2009-06-17 23:44:25 +0000
3+++ packages/rpm/openvista-libs-5.3003.spec 2009-06-18 15:25:31 +0000
4@@ -6,7 +6,7 @@
5
6 Name: openvista-libs-5.3003
7 Version: 0.8.1
8-Release: 1
9+Release: 2
10 Summary: GT.M External Calls for OpenVista
11 License: AGPL
12 Vendor: Medsphere Systems Corporation
13@@ -19,8 +19,8 @@
14 Requires(post): /usr/sbin/semanage, /sbin/restorecon
15 Requires(postun): /usr/sbin/semanage
16
17-Requires: pam, fis-gtm-5.3003
18-BuildRequires: pam-devel, fis-gtm-5.3003
19+Requires: fis-gtm-5.3003
20+BuildRequires: fis-gtm-5.3003
21
22 Obsoletes: openvista-libs
23
24@@ -49,11 +49,6 @@
25 cd src/gtmsignal
26 ./compile.sh
27
28-cd ../../
29-
30-cd src/ovauth
31-./compile.sh
32-
33 %install
34 rm -rf %{buildroot}
35
36@@ -61,8 +56,6 @@
37 install -m 550 src/libopenvista/libopenvista.so %{buildroot}%{gtm_dist}
38 install -m 440 src/libopenvista/openvista.xc %{buildroot}%{gtm_dist}
39 install -m 4550 src/gtmsignal/gtmsignal %{buildroot}%{gtm_dist}
40-install -d %{buildroot}/sbin
41-install -m 4550 src/ovauth/ovauth %{buildroot}/sbin
42
43 %clean
44 rm -rf %{buildroot}
45@@ -78,8 +71,6 @@
46 %{gtm_dist}/openvista.xc
47 %defattr(-,root,gtm)
48 %{gtm_dist}/gtmsignal
49-%defattr(-,root,openvista)
50-/sbin/ovauth
51
52 %post
53 # See http://fedoraproject.org/wiki/PackagingDrafts/SELinux
54
55=== modified file 'packages/rpm/openvista-utils.spec'
56--- packages/rpm/openvista-utils.spec 2009-06-05 19:50:29 +0000
57+++ packages/rpm/openvista-utils.spec 2009-06-18 15:25:31 +0000
58@@ -1,6 +1,6 @@
59 Name: openvista-utils
60 Version: 0.8.1
61-Release: 1
62+Release: 2
63 Summary: Utilities for configuring and managing OpenVista
64 License: AGPL
65 Vendor: Medsphere Systems Corporation
66@@ -16,6 +16,7 @@
67 Requires: /bin/bash, coreutils, openssh, /usr/bin/logger, /usr/bin/rsync, /bin/tar, /usr/bin/bzip2, /usr/bin/find, vixie-cron
68 Requires: fis-gtm, openvista-libs
69 Requires: httpd, mod_ssl, pam
70+BuildRequires: pam-devel
71
72 # RPM should have a suggests tag...
73 # Suggests: /usr/bin/puttygen, bash-completion, /usr/bin/pbzip2
74@@ -25,7 +26,6 @@
75 Source0: openvista-utils-%{version}.tar.bz2
76 Source1: webdav.conf
77 Source2: openvista
78-BuildArch: noarch
79 BuildRoot: %{_tmppath}/%{name}-root
80
81 %description
82@@ -40,6 +40,8 @@
83 %setup
84
85 %build
86+cd src/ovauth
87+./compile.sh
88
89 %install
90 rm -rf %{buildroot}
91@@ -107,9 +109,11 @@
92 install -d %{buildroot}/var/www/html/webdav
93
94 install -d %{buildroot}%{_sysconfdir}/pam.d
95-
96 install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/
97
98+install -d %{buildroot}/sbin
99+install -m 4550 src/ovauth/ovauth %{buildroot}/sbin
100+
101 %clean
102 rm -rf %{buildroot}
103
104@@ -150,6 +154,7 @@
105 %config %{_sysconfdir}/httpd/conf/webdav.htpasswd
106 %dir /var/www/html/webdav
107 %{_sysconfdir}/pam.d/openvista
108+%attr(4550,root,openvista) /sbin/ovauth
109
110 %pre
111 /usr/sbin/useradd -G gtm openvista 2> /dev/null || :

Subscribers

People subscribed via source and target branches