rpms/mach/F-11 mach.spec,1.20,1.21

[Thomas Vander Stichele]

Author: thomasvs

Update of /cvs/extras/rpms/mach/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21392/F-11

Modified Files:
	mach.spec 
Log Message:
upstream spec fixes



Index: mach.spec
===================================================================
RCS file: /cvs/extras/rpms/mach/F-11/mach.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- mach.spec	27 Jun 2009 21:31:12 -0000	1.20
+++ mach.spec	14 Nov 2009 17:35:03 -0000	1.21
@@ -9,18 +9,18 @@ URL:            http://thomas.apestaart.
 Source:         http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Requires:	python
-Requires:	rpm
-Requires:	rpm-build
-Requires:	rpm-python
-Requires:	yum
-Requires:	createrepo
-Requires:	sed
-Requires:	cpio
-
-BuildRequires:	python
-BuildRequires:	gcc-c++
-BuildRequires:	libselinux-devel
+Requires:       python
+Requires:       rpm
+Requires:       rpm-build
+Requires:       rpm-python
+Requires:       yum
+Requires:       createrepo
+Requires:       sed
+Requires:       cpio
+
+BuildRequires:  python
+BuildRequires:  gcc-c++
+BuildRequires:  libselinux-devel
 
 %if 0%{!?flavor:1}
 %if 0%{?rhel}
@@ -49,14 +49,18 @@ Thomas Vander Stichele (thomas (at) apes
 
 %build
 %configure \
-	--enable-builduser=%{builduser} \
-	--enable-buildgroup=%{buildgroup} \
-	--with-flavor=%{flavor}
+        --enable-builduser=%{builduser} \
+        --enable-buildgroup=%{buildgroup} \
+        --with-flavor=%{flavor}
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+
+# no dev package
+rm $RPM_BUILD_ROOT%{_libdir}/*.so
+
 install -d -m 2775 $RPM_BUILD_ROOT%{_localstatedir}/lib/mach
 install -d -m 2775 $RPM_BUILD_ROOT%{_localstatedir}/lib/mach/states
 install -d -m 2775 $RPM_BUILD_ROOT%{_localstatedir}/lib/mach/roots
@@ -70,6 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 getent group mach >/dev/null || groupadd -r mach || :
+/sbin/ldconfig
 
 %preun
 if [ "$1" == 0 ];
@@ -85,14 +90,15 @@ then
   rmdir %{_localstatedir}/cache/mach > /dev/null 2>&1 || :
   rm -rf %{_localstatedir}/tmp/mach > /dev/null 2>&1 || :
 fi
+/sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE mach.doap
+%doc ChangeLog COPYING README AUTHORS TODO FORGETMENOT RELEASE mach.doap
 %dir %{_sysconfdir}/mach
-%config %{_sysconfdir}/mach/conf
+%config(noreplace) %{_sysconfdir}/mach/conf
 %config(noreplace) %{_sysconfdir}/mach/location
-%config %{_sysconfdir}/mach/dist.d
+%config(noreplace) %{_sysconfdir}/mach/dist.d
 %attr(2775,root,mach) %dir %{_localstatedir}/lib/mach
 %attr(2775,root,mach) %dir %{_localstatedir}/lib/mach/states
 %attr(2775,root,mach) %dir %{_localstatedir}/lib/mach/roots