rpms/rrdtool/FC-5 rrdtool.spec,1.14,1.15

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/rrdtool/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14358

Modified Files:
	rrdtool.spec 
Log Message:
Fixes from jpo (bz 185909)




Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/rpms/rrdtool/FC-5/rrdtool.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rrdtool.spec	5 Jun 2006 15:28:52 -0000	1.14
+++ rrdtool.spec	5 Jun 2006 19:12:37 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
 Version: 1.0.50
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
@@ -11,9 +11,10 @@
 Patch0: rrdtool-1.0.49-php_config.patch
 Patch1: rrdtool-1.0.49-fc4.patch
 Patch2: rrdtool-1.0.50-config.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-c++, php-devel >= 4.0, openssl-devel
 BuildRequires: libpng-devel, zlib-devel
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -28,7 +29,7 @@
 %package devel
 Summary: RRDtool static libraries and header files
 Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -39,7 +40,7 @@
 %package -n php-rrdtool
 Summary: RRDtool module for PHP
 Group: Development/Languages
-Requires: %{name} = %{version}, php >= 4.0
+Requires: %{name} = %{version}-%{release}, php >= 4.0
 
 %description -n php-rrdtool
 The php-%{name} package includes a dynamic shared object (DSO) that adds
@@ -52,6 +53,9 @@
 %patch1 -p1 -b .fc4
 %patch2 -p1 -b .config
 
+# Clean up CVS scraps
+find . -type d -name CVS | xargs rm -rf
+
 # Fixes to /usr/lib(64) for x86_64
 %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \
     configure contrib/php4/configure Makefile.in
@@ -102,6 +106,7 @@
 # Put perl files back where they belong
 %{__mkdir_p} %{buildroot}%{perl_vendorarch}/
 %{__mv} %{buildroot}%{_libdir}/perl/* %{buildroot}%{perl_vendorarch}/
+find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';'
 
 # We only want .txt and .html files for the main documentation
 %{__mkdir_p} doc2/doc
@@ -120,6 +125,9 @@
 %clean
 %{__rm} -rf %{buildroot}
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-, root, root, 0755)
@@ -143,13 +151,21 @@
 
 
 %files -n php-rrdtool
-%defattr(-, root, root)
+%defattr(-, root, root, 0755)
 %doc contrib/php4/examples contrib/php4/README
 %config(noreplace) %{_sysconfdir}/php.d/rrdtool.ini
 %{php_extdir}/rrdtool.so
 
 
 %changelog
+* Mon Jun 05 2006 Jarod Wilson <jwilson at redhat.com> 1.0.50-3
+- From Jose Pedro Oliveira (bz #185909)
+  - Add missing post/postun ldconfigs
+  - Add perl(:MODULE_COMPAT_xxx) requirement to base package
+  - Tighten up Requires: in subpackages
+  - Nuke CVS directories/files
+  - Remove empty .bs files
+
 * Mon Jun 05 2006 Jarod Wilson <jwilson at redhat.com> 1.0.50-2
 - Kill static libs