- updated to new version from contrib (let's call it 1.2 as it's ready for rrdtool...

- removed obsolete patches, added sed hack for lib64 support

Changed files:
    php-rrdtool.spec -> 1.13

diff --git a/php-rrdtool.spec b/php-rrdtool.spec
index fbd4ee862aee9784a34d9d6b682e88d62cc9caaf..fa8a7fff1ee8483b8f23845e327e6881fd23aa5b 100644 (file)
--- a/php-rrdtool.spec
+++ b/php-rrdtool.spec
@@ -4,21 +4,17 @@
 Summary:       RRDtool PHP module
 Summary(pl):   Modu³ PHP RRDtool
 Name:          php-rrdtool
-Version:       1.0.50
-Release:       6
+Version:       1.2
+Release:       1
 License:       GPL
 Group:         Applications/Databases
-Source0:       http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x/rrdtool-%{version}.tar.gz
-# Source0-md5: c466e2e7df95fa8e318e46437da87686
-Patch0:                rrdtool-php-config.patch
-Patch1:                %{name}-new.patch
+Source0:       http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/contrib/php_rrdtool.tgz
+# Source0-md5: c86a45cfc54517b9066c480bbc589d43
 URL:           http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
-BuildRequires: cgilibc-devel
-BuildRequires: gd-devel
-BuildRequires: openssl-devel >= 0.9.5
 BuildRequires: php-devel >= 3:5.0.0
 BuildRequires: rpmbuild(macros) >= 1.238
 BuildRequires: rrdtool-devel >= 1.2.10
+BuildRequires: sed >= 4.0
 %{?requires_php_extension}
 Requires:      %{_sysconfdir}/conf.d
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -32,16 +28,14 @@ Ten pakiet zawiera dynamiczny modu
 do jêzyka skryptowego PHP.
 
 %prep
-%setup -q -n rrdtool-%{version}
-%patch0 -p0
-%patch1 -p1
+%setup -q -n rrdtool
+
+sed -i -e 's,/lib\>,/%{_lib},' config.m4
 
 %build
-cd contrib/php4
 phpize
 %configure \
-       --with-openssl \
-       --includedir="%{_includedir}/php"
+       --with-rrdtool=shared
 
 %{__make}
 
@@ -49,7 +43,6 @@ phpize
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{_examplesdir}/%{name}-%{version}}
 
-cd contrib/php4
 %{__make} install \
        INSTALL_ROOT=$RPM_BUILD_ROOT
 
@@ -58,8 +51,6 @@ cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
 extension=%{_modname}.so
 EOF
 
-cp -a examples/*.php $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -75,7 +66,5 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc contrib/php4/USAGE
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_modname}.ini
 %attr(755,root,root) %{extensionsdir}/%{_modname}.so
-%{_examplesdir}/%{name}-%{version}