SPECS: php-pecl-bcompiler.spec, php-pecl-big_int.spec, php-pecl-bi...

glen glen at pld-linux.org
Fri Dec 15 00:53:49 CET 2006 

Author: glen                         Date: Thu Dec 14 23:53:49 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use new php extension related macros

---- Files affected:
SPECS:
   php-pecl-bcompiler.spec (1.22 -> 1.23) , php-pecl-big_int.spec (1.14 -> 1.15) , php-pecl-bitset.spec (1.7 -> 1.8) , php-pecl-blenc.spec (1.7 -> 1.8) , php-pecl-bz2.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/php-pecl-bcompiler.spec
diff -u SPECS/php-pecl-bcompiler.spec:1.22 SPECS/php-pecl-bcompiler.spec:1.23
--- SPECS/php-pecl-bcompiler.spec:1.22	Wed Dec 13 23:16:28 2006
+++ SPECS/php-pecl-bcompiler.spec	Fri Dec 15 00:53:43 2006
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 %define		_modname	bcompiler
 %define		_status		beta
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 Summary:	%{_modname} - a bytecode compiler for classes
 Summary(pl):	%{_modname} - kompilator kodu bajtowego dla klas
 Name:		php-pecl-%{_modname}
@@ -15,9 +13,9 @@
 URL:		http://pecl.php.net/package/bcompiler/
 BuildRequires:	bzip2-devel
 BuildRequires:	php-devel >= 3:5.0.0
-BuildRequires:	rpmbuild(macros) >= 1.322
+BuildRequires:	rpmbuild(macros) >= 1.344
 %{?requires_php_extension}
-Requires:	%{_sysconfdir}/conf.d
+Requires:	php-common >= 4:5.0.4
 Obsoletes:	php-pear-%{_modname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -62,10 +60,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
+install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}}
 
-install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{php_extensiondir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
 ; Enable %{_modname} extension module
 extension=%{_modname}.so
 EOF
@@ -74,20 +72,18 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+%php_webserver_restart
 
 %postun
 if [ "$1" = 0 ]; then
-	[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-	[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+	%php_webserver_restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc %{_modname}-%{version}/examples/*
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_modname}.ini
-%attr(755,root,root) %{extensionsdir}/%{_modname}.so
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{_modname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{_modname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -95,6 +91,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2006/12/14 23:53:43  glen
+- use new php extension related macros
+
 Revision 1.22  2006/12/13 22:16:28  glen
 - update to 0.8
 

================================================================
Index: SPECS/php-pecl-big_int.spec
diff -u SPECS/php-pecl-big_int.spec:1.14 SPECS/php-pecl-big_int.spec:1.15
--- SPECS/php-pecl-big_int.spec:1.14	Wed Dec 13 23:17:27 2006
+++ SPECS/php-pecl-big_int.spec	Fri Dec 15 00:53:43 2006
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 %define		_modname	big_int
 %define		_status		stable
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 Summary:	%{_modname} - set of functions for calculations with arbitrary length integers
 Summary(pl):	%{_modname} - zestaw funkcji do obliczeń z użyciem liczb o dowolnej wielkości
 Name:		php-pecl-%{_modname}
@@ -14,9 +12,9 @@
 # Source0-md5:	d858d5bcfd3f789cb1ae8cb8ff09d3e9
 URL:		http://pecl.php.net/package/big_int/
 BuildRequires:	php-devel >= 3:5.0.0
-BuildRequires:	rpmbuild(macros) >= 1.322
+BuildRequires:	rpmbuild(macros) >= 1.344
 %{?requires_php_extension}
-Requires:	%{_sysconfdir}/conf.d
+Requires:	php-common >= 4:5.0.4
 Obsoletes:	php-pear-%{_modname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -60,10 +58,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
+install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}}
 
-install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{php_extensiondir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
 ; Enable %{_modname} extension module
 extension=%{_modname}.so
 EOF
@@ -72,20 +70,18 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+%php_webserver_restart
 
 %postun
 if [ "$1" = 0 ]; then
-	[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-	[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+	%php_webserver_restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc %{_modname}-%{version}/{docs,tests,CREDITS,README}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_modname}.ini
-%attr(755,root,root) %{extensionsdir}/%{_modname}.so
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{_modname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{_modname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -93,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2006/12/14 23:53:43  glen
+- use new php extension related macros
+
 Revision 1.14  2006/12/13 22:17:27  glen
 - update to 1.0.7
 

================================================================
Index: SPECS/php-pecl-bitset.spec
diff -u SPECS/php-pecl-bitset.spec:1.7 SPECS/php-pecl-bitset.spec:1.8
--- SPECS/php-pecl-bitset.spec:1.7	Fri Nov  3 00:09:09 2006
+++ SPECS/php-pecl-bitset.spec	Fri Dec 15 00:53:43 2006
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 %define		_modname	bitset
 %define		_status		stable
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 Summary:	%{_modname} - managing sets of bits
 Summary(pl):	%{_modname} - obróbka zbiorów bitów
 Name:		php-pecl-%{_modname}
@@ -14,9 +12,9 @@
 # Source0-md5:	9a4514a398a1b192fe215521db5f7546
 URL:		http://pecl.php.net/package/bitset/
 BuildRequires:	php-devel >= 3:5.0.0
-BuildRequires:	rpmbuild(macros) >= 1.322
+BuildRequires:	rpmbuild(macros) >= 1.344
 %{?requires_php_extension}
-Requires:	%{_sysconfdir}/conf.d
+Requires:	php-common >= 4:5.0.4
 Obsoletes:	php-pear-%{_modname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -43,10 +41,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
+install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}}
 
-install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{php_extensiondir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
 ; Enable %{_modname} extension module
 extension=%{_modname}.so
 EOF
@@ -55,20 +53,18 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+%php_webserver_restart
 
 %postun
 if [ "$1" = 0 ]; then
-	[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-	[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+	%php_webserver_restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc %{_modname}-%{version}/{CREDITS,EXPERIMENTAL,README}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_modname}.ini
-%attr(755,root,root) %{extensionsdir}/%{_modname}.so
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{_modname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{_modname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -76,6 +72,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/12/14 23:53:43  glen
+- use new php extension related macros
+
 Revision 1.7  2006/11/02 23:09:09  glen
 - BR rpmmacros for fixed %requires_php_extension
 

================================================================
Index: SPECS/php-pecl-blenc.spec
diff -u SPECS/php-pecl-blenc.spec:1.7 SPECS/php-pecl-blenc.spec:1.8
--- SPECS/php-pecl-blenc.spec:1.7	Fri Nov  3 00:09:09 2006
+++ SPECS/php-pecl-blenc.spec	Fri Dec 15 00:53:43 2006
@@ -1,10 +1,9 @@
 # $Revision$, $Date$
-%define		_modname	blenc
-%define		_status		alpha
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 # TODO
 # - doesn't build
+%define		_modname	blenc
+%define		_status		alpha
+#
 Summary:	%{_modname} - transparent PHP script encryption using Blowfish
 Summary(pl):	%{_modname} - transparentne szyfrowanie skryptów algorytmem Blowfish
 Name:		php-pecl-%{_modname}
@@ -18,9 +17,9 @@
 # Source0-md5:	178ea0333257b396cc19dfea8ea0e429
 URL:		http://pecl.php.net/package/blenc/
 BuildRequires:	php-devel >= 3:5.0.0
-BuildRequires:	rpmbuild(macros) >= 1.322
+BuildRequires:	rpmbuild(macros) >= 1.344
 %{?requires_php_extension}
-Requires:	%{_sysconfdir}/conf.d
+Requires:	php-common >= 4:5.0.4
 Obsoletes:	php-pear-%{_modname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,10 +54,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
+install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}}
 
-install %{_modname}-%{version}%{_ver}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{php_extensiondir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
 ; Enable %{_modname} extension module
 extension=%{_modname}.so
 EOF
@@ -67,20 +66,18 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+%php_webserver_restart
 
 %postun
 if [ "$1" = 0 ]; then
-	[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-	[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+	%php_webserver_restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc %{_modname}-%{version}%{_ver}/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_modname}.ini
-%attr(755,root,root) %{extensionsdir}/%{_modname}.so
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{_modname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{_modname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -88,6 +85,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/12/14 23:53:43  glen
+- use new php extension related macros
+
 Revision 1.7  2006/11/02 23:09:09  glen
 - BR rpmmacros for fixed %requires_php_extension
 

================================================================
Index: SPECS/php-pecl-bz2.spec
diff -u SPECS/php-pecl-bz2.spec:1.18 SPECS/php-pecl-bz2.spec:1.19
--- SPECS/php-pecl-bz2.spec:1.18	Wed Dec 13 23:18:45 2006
+++ SPECS/php-pecl-bz2.spec	Fri Dec 15 00:53:43 2006
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 %define		_modname	bz2
 %define		_status		stable
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 Summary:	%{_modname} - A bzip2 management system
 Summary(pl):	%{_modname} - Zarządzanie plikami bzip2
 Name:		php-pecl-%{_modname}
@@ -15,9 +13,9 @@
 URL:		http://pecl.php.net/package/bz2/
 BuildRequires:	bzip2-devel
 BuildRequires:	php-devel >= 3:5.0.0
-BuildRequires:	rpmbuild(macros) >= 1.322
+BuildRequires:	rpmbuild(macros) >= 1.344
 %{?requires_php_extension}
-Requires:	%{_sysconfdir}/conf.d
+Requires:	php-common >= 4:5.0.4
 Obsoletes:	php-pear-%{_modname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -43,10 +41,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
+install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}}
 
-install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{php_extensiondir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
 ; Enable %{_modname} extension module
 extension=%{_modname}.so
 EOF
@@ -55,20 +53,18 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+%php_webserver_restart
 
 %postun
 if [ "$1" = 0 ]; then
-	[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-	[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+	%php_webserver_restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc %{_modname}-%{version}/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_modname}.ini
-%attr(755,root,root) %{extensionsdir}/%{_modname}.so
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{_modname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{_modname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -76,6 +72,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2006/12/14 23:53:43  glen
+- use new php extension related macros
+
 Revision 1.18  2006/12/13 22:18:45  glen
 - rel 6 (php 5.2.0)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-pecl-bcompiler.spec?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-big_int.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-bitset.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-blenc.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-bz2.spec?r1=1.18&r2=1.19&f=u

More information about the pld-cvs-commit mailing list