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

[Jon Tai]

[jeff.apple (jeff-apple)]

review: Approve

=== modified file 'packages/rpm/openvista-libs-5.3003.spec'
--- packages/rpm/openvista-libs-5.3003.spec	2009-06-17 23:44:25 +0000
+++ packages/rpm/openvista-libs-5.3003.spec	2009-06-18 15:25:31 +0000
@@ -6,7 +6,7 @@
 
 Name:		openvista-libs-5.3003
 Version:	0.8.1
-Release:	1
+Release:	2
 Summary:	GT.M External Calls for OpenVista
 License:	AGPL
 Vendor:		Medsphere Systems Corporation
@@ -19,8 +19,8 @@
 Requires(post):		/usr/sbin/semanage, /sbin/restorecon
 Requires(postun):	/usr/sbin/semanage
 
-Requires:	pam, fis-gtm-5.3003
-BuildRequires:	pam-devel, fis-gtm-5.3003
+Requires:	fis-gtm-5.3003
+BuildRequires:	fis-gtm-5.3003
 
 Obsoletes:	openvista-libs
 
@@ -49,11 +49,6 @@
 cd src/gtmsignal
 ./compile.sh
 
-cd ../../
-
-cd src/ovauth
-./compile.sh
-
 %install
 rm -rf %{buildroot}
 
@@ -61,8 +56,6 @@
 install -m 550 src/libopenvista/libopenvista.so %{buildroot}%{gtm_dist}
 install -m 440 src/libopenvista/openvista.xc %{buildroot}%{gtm_dist}
 install -m 4550 src/gtmsignal/gtmsignal %{buildroot}%{gtm_dist}
-install -d %{buildroot}/sbin
-install -m 4550 src/ovauth/ovauth %{buildroot}/sbin
 
 %clean
 rm -rf %{buildroot}
@@ -78,8 +71,6 @@
 %{gtm_dist}/openvista.xc
 %defattr(-,root,gtm)
 %{gtm_dist}/gtmsignal
-%defattr(-,root,openvista)
-/sbin/ovauth
 
 %post
 # See http://fedoraproject.org/wiki/PackagingDrafts/SELinux
 
=== modified file 'packages/rpm/openvista-utils.spec'
--- packages/rpm/openvista-utils.spec	2009-06-05 19:50:29 +0000
+++ packages/rpm/openvista-utils.spec	2009-06-18 15:25:31 +0000
@@ -1,6 +1,6 @@
 Name:		openvista-utils
 Version:	0.8.1
-Release:	1
+Release:	2
 Summary:	Utilities for configuring and managing OpenVista
 License:	AGPL
 Vendor:		Medsphere Systems Corporation
@@ -16,6 +16,7 @@
 Requires:	/bin/bash, coreutils, openssh, /usr/bin/logger, /usr/bin/rsync, /bin/tar, /usr/bin/bzip2, /usr/bin/find, vixie-cron
 Requires:	fis-gtm, openvista-libs
 Requires:	httpd, mod_ssl, pam
+BuildRequires:	pam-devel
 
 # RPM should have a suggests tag...
 # Suggests:	/usr/bin/puttygen, bash-completion, /usr/bin/pbzip2
@@ -25,7 +26,6 @@
 Source0:	openvista-utils-%{version}.tar.bz2
 Source1:	webdav.conf
 Source2:	openvista
-BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-root
 
 %description
@@ -40,6 +40,8 @@
 %setup
 
 %build
+cd src/ovauth
+./compile.sh
 
 %install
 rm -rf %{buildroot}
@@ -107,9 +109,11 @@
 install -d %{buildroot}/var/www/html/webdav
 
 install -d %{buildroot}%{_sysconfdir}/pam.d
-
 install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/
 
+install -d %{buildroot}/sbin
+install -m 4550 src/ovauth/ovauth %{buildroot}/sbin
+
 %clean
 rm -rf %{buildroot}
 
@@ -150,6 +154,7 @@
 %config %{_sysconfdir}/httpd/conf/webdav.htpasswd
 %dir /var/www/html/webdav
 %{_sysconfdir}/pam.d/openvista
+%attr(4550,root,openvista) /sbin/ovauth
 
 %pre
 /usr/sbin/useradd -G gtm openvista 2> /dev/null || :