- final fixes; post/postun scripts

Changed files:
    rrdtool.spec -> 1.83

diff --git a/rrdtool.spec b/rrdtool.spec
index e9995c0693d32294cd45794e3c54886b7ea4b46b..0859567cc71db0f98b8b7de5cdd2c638b001a9c1 100644 (file)
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -15,6 +15,7 @@ Patch0:               %{name}-makefile.patch
 Patch1:                %{name}-perl-install.patch
 Patch2:                %{name}-acfix.patch
 Patch3:                %{name}-system-libs.patch
+Patch4:                %{name}-php-config.patch
 URL:           http://ee-staff.ethz.ch/~oetiker/webtools/rrdtol/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -149,10 +150,11 @@ RRD - 
 Summary:       RRDtool php module
 Summary(pl):   Modu³ PHP RRDtool
 Group:         Unknown/Unknown
-Requires:      %{name} = %{version}
+Requires(post,preun):   php-common
+Requires:       php-common
 
 %description -n php-rrdtool
-empty
+RRDtool module for PHP.
 
 %prep
 %setup -q
@@ -160,6 +162,7 @@ empty
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p0
 
 %{__perl} -pi -e 's/--localdir=/-B /g' Makefile.am */Makefile.am
 
@@ -186,7 +189,8 @@ cd contrib/php4
 %{__autoconf}
 %configure \
        --with-openssl \
-       --with-rrdtool="$(pwd)/../../temp-install%{_prefix}"
+       --with-rrdtool="$(pwd)/../../temp-install%{_prefix}" \
+       --includedir="%{_includedir}/php"
 %{__make}
 cd ../../
 
@@ -223,6 +227,14 @@ rm -rf $RPM_BUILD_ROOT
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post -n php-rrdtool
+%{_sbindir}/php-module-install install rrdtool %{_sysconfdir}/php.ini
+
+%preun -n php-rrdtool
+if [ "$1" = "0" ]; then
+        %{_sbindir}/php-module-install remove rrdtool %{_sysconfdir}/php.ini
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc CHANGES CONTRIBUTORS README TODO doc/*.html