Author: qboosh                       Date: Sun May 28 08:38:50 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to new version from contrib (let's call it 1.2 as it's ready for 
rrdtool 1.2.x)
- removed obsolete patches, added sed hack for lib64 support

---- Files affected:
SPECS:
   php-rrdtool.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/php-rrdtool.spec
diff -u SPECS/php-rrdtool.spec:1.12 SPECS/php-rrdtool.spec:1.13
--- SPECS/php-rrdtool.spec:1.12 Sat Dec 24 16:39:39 2005
+++ SPECS/php-rrdtool.spec      Sun May 28 10:38:45 2006
@@ -5,21 +5,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)
@@ -33,16 +29,14 @@
 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}
 
@@ -50,7 +44,6 @@
 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
 
@@ -59,8 +52,6 @@
 extension=%{_modname}.so
 EOF
 
-cp -a examples/*.php $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -76,10 +67,8 @@
 
 %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}
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -87,6 +76,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/05/28 08:38:45  qboosh
+- updated to new version from contrib (let's call it 1.2 as it's ready for 
rrdtool 1.2.x)
+- removed obsolete patches, added sed hack for lib64 support
+
 Revision 1.12  2005/12/24 15:39:39  glen
 - rel 6 (rebuild with new php)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-rrdtool.spec?r1=1.12&r2=1.13&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to