SPECS: php-pecl-netools.spec, php-pecl-odbtp.spec, php-pecl-oggvor...

glen glen at pld-linux.org
Tue Jan 2 20:59:05 CET 2007 

Author: glen                         Date: Tue Jan  2 19:59:05 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use new php extension related macros

---- Files affected:
SPECS:
   php-pecl-netools.spec (1.15 -> 1.16) , php-pecl-odbtp.spec (1.23 -> 1.24) , php-pecl-oggvorbis.spec (1.10 -> 1.11) , php-pecl-openal.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/php-pecl-netools.spec
diff -u SPECS/php-pecl-netools.spec:1.15 SPECS/php-pecl-netools.spec:1.16
--- SPECS/php-pecl-netools.spec:1.15	Fri Nov  3 00:09:09 2006
+++ SPECS/php-pecl-netools.spec	Tue Jan  2 20:58:59 2007
@@ -5,8 +5,6 @@
 # configure: error: Please reinstall the lcrzo distribution
 %define		_modname	netools
 %define		_status		alpha
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 Summary:	Networking tools
 Summary(pl):	Narzędzia sieciowe
 Name:		php-pecl-%{_modname}
@@ -18,9 +16,9 @@
 # Source0-md5:	4e8da7ee78ff40c9eaec64568735eaeb
 URL:		http://pecl.php.net/package/netools/
 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
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,10 +46,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
@@ -60,20 +58,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
@@ -81,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2007/01/02 19:58:59  glen
+- use new php extension related macros
+
 Revision 1.15  2006/11/02 23:09:09  glen
 - BR rpmmacros for fixed %requires_php_extension
 

================================================================
Index: SPECS/php-pecl-odbtp.spec
diff -u SPECS/php-pecl-odbtp.spec:1.23 SPECS/php-pecl-odbtp.spec:1.24
--- SPECS/php-pecl-odbtp.spec:1.23	Wed Dec 13 23:55:32 2006
+++ SPECS/php-pecl-odbtp.spec	Tue Jan  2 20:58:59 2007
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 %define		_modname	odbtp
 %define		_status		stable
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 Summary:	%{_modname} - ODBTP client functions
 Summary(pl):	%{_modname} - funkcjonalność klienta ODBTP
 Name:		php-pecl-%{_modname}
@@ -18,9 +16,9 @@
 URL:		http://pecl.php.net/package/odbtp/
 BuildRequires:	odbtp-devel = %{version}
 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
 Provides:	php(odbtp)
 Obsoletes:	php-odbtp
 Obsoletes:	php-pear-odbtp
@@ -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}/{CREDITS,EXPERIMENTAL}
-%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.24  2007/01/02 19:58:59  glen
+- use new php extension related macros
+
 Revision 1.23  2006/12/13 22:55:32  glen
 - rel 3 (php 5.2.0)
 

================================================================
Index: SPECS/php-pecl-oggvorbis.spec
diff -u SPECS/php-pecl-oggvorbis.spec:1.10 SPECS/php-pecl-oggvorbis.spec:1.11
--- SPECS/php-pecl-oggvorbis.spec:1.10	Fri Nov  3 00:09:09 2006
+++ SPECS/php-pecl-oggvorbis.spec	Tue Jan  2 20:58:59 2007
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 %define		_modname	oggvorbis
 %define		_status		beta
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 Summary:	%{_modname} - Ogg wrapper for Ogg/Vorbis files
 Summary(pl):	%{_modname} - wrapper Ogg dla plików Ogg/Vorbis
 Name:		php-pecl-%{_modname}
@@ -16,9 +14,9 @@
 BuildRequires:	libogg-devel >= 2:1.0
 BuildRequires:	libvorbis-devel >= 1:1.0
 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)
 
@@ -45,10 +43,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
@@ -57,19 +55,17 @@
 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)
-%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
@@ -77,6 +73,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2007/01/02 19:58:59  glen
+- use new php extension related macros
+
 Revision 1.10  2006/11/02 23:09:09  glen
 - BR rpmmacros for fixed %requires_php_extension
 

================================================================
Index: SPECS/php-pecl-openal.spec
diff -u SPECS/php-pecl-openal.spec:1.9 SPECS/php-pecl-openal.spec:1.10
--- SPECS/php-pecl-openal.spec:1.9	Fri Nov  3 00:09:09 2006
+++ SPECS/php-pecl-openal.spec	Tue Jan  2 20:58:59 2007
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 %define		_modname	openal
 %define		_status		beta
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 Summary:	%{_modname} - bindings to OpenAL
 Summary(pl):	%{_modname} - dowiązania do OpenAL
 Name:		php-pecl-%{_modname}
@@ -15,9 +13,9 @@
 URL:		http://pecl.php.net/package/openal/
 BuildRequires:	OpenAL-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,19 +53,17 @@
 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)
-%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
@@ -75,6 +71,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007/01/02 19:58:59  glen
+- use new php extension related macros
+
 Revision 1.9  2006/11/02 23:09:09  glen
 - BR rpmmacros for fixed %requires_php_extension
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-pecl-netools.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-odbtp.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-oggvorbis.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-openal.spec?r1=1.9&r2=1.10&f=u

More information about the pld-cvs-commit mailing list