SPECS: php-pecl-Net_Gopher.spec, php-pecl-PDO.spec, php-pecl-PDO_F...

glen glen at pld-linux.org
Fri Dec 15 00:33:12 CET 2006 

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

---- Files affected:
SPECS:
   php-pecl-Net_Gopher.spec (1.15 -> 1.16) , php-pecl-PDO.spec (1.18 -> 1.19) , php-pecl-PDO_FIREBIRD.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/php-pecl-Net_Gopher.spec
diff -u SPECS/php-pecl-Net_Gopher.spec:1.15 SPECS/php-pecl-Net_Gopher.spec:1.16
--- SPECS/php-pecl-Net_Gopher.spec:1.15	Wed Dec 13 23:10:40 2006
+++ SPECS/php-pecl-Net_Gopher.spec	Fri Dec 15 00:33:07 2006
@@ -2,8 +2,6 @@
 %define		_modname	Net_Gopher
 %define		_smodname	gopher
 %define		_status		stable
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 Summary:	%{_modname} - fopen wrapper for the gopher protocol
 Summary(pl):	%{_modname} - wrapper fopen dla protokołu gopher
 Name:		php-pecl-%{_modname}
@@ -15,9 +13,9 @@
 # Source0-md5:	85435fc2d8f067558acc81c33a453d83
 URL:		http://pecl.php.net/package/Net_Gopher/
 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/%{_smodname}.so $RPM_BUILD_ROOT%{extensionsdir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_smodname}.ini
+install %{_modname}-%{version}/modules/%{_smodname}.so $RPM_BUILD_ROOT%{php_extensiondir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_smodname}.ini
 ; Enable %{_modname} extension module
 extension=%{_smodname}.so
 EOF
@@ -58,8 +56,8 @@
 
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_smodname}.ini
-%attr(755,root,root) %{extensionsdir}/%{_smodname}.so
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{_smodname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{_smodname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -67,6 +65,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2006/12/14 23:33:07  glen
+- use new php extension related macros
+
 Revision 1.15  2006/12/13 22:10:40  glen
 - rel 6 (php 5.2.0)
 

================================================================
Index: SPECS/php-pecl-PDO.spec
diff -u SPECS/php-pecl-PDO.spec:1.18 SPECS/php-pecl-PDO.spec:1.19
--- SPECS/php-pecl-PDO.spec:1.18	Sun Nov 26 16:34:32 2006
+++ SPECS/php-pecl-PDO.spec	Fri Dec 15 00:33:07 2006
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 %define		_modname	PDO
 %define		_status		stable
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 
 # must be in sync with source. extra check ensuring that it is so is done in %%build
 %define		php_pdo_api_version	20060409
@@ -17,9 +15,9 @@
 # Source0-md5:	74bff68b3f1caaf745edaddbd4df7291
 URL:		http://pecl.php.net/package/PDO/
 BuildRequires:	php-devel >= 3:5.0.3
-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(PDO_API) = %{php_pdo_api_version}
 Provides:	php(pdo)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -70,11 +68,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir},%{_includedir}/php/ext/pdo}
+install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir},%{_includedir}/php/ext/pdo}
 
-install %{_modname}-%{version}/modules/pdo.so $RPM_BUILD_ROOT%{extensionsdir}/%{_modname}.so
+install %{_modname}-%{version}/modules/pdo.so $RPM_BUILD_ROOT%{php_extensiondir}/%{_modname}.so
 install %{_modname}-%{version}/{php_pdo_int.h,php_pdo.h,php_pdo_driver.h} $RPM_BUILD_ROOT%{_includedir}/php/ext/pdo
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
 ; Enable %{_modname} extension module
 extension=%{_modname}.so
 EOF
@@ -83,20 +81,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,README,TODO}
-%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
 
 %files devel
 %defattr(644,root,root,755)
@@ -108,6 +104,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2006/12/14 23:33:07  glen
+- use new php extension related macros
+
 Revision 1.18  2006/11/26 15:34:32  glen
 - rel 3: add Provides: php(%{_modname})
 

================================================================
Index: SPECS/php-pecl-PDO_FIREBIRD.spec
diff -u SPECS/php-pecl-PDO_FIREBIRD.spec:1.18 SPECS/php-pecl-PDO_FIREBIRD.spec:1.19
--- SPECS/php-pecl-PDO_FIREBIRD.spec:1.18	Sun Nov 26 16:34:43 2006
+++ SPECS/php-pecl-PDO_FIREBIRD.spec	Fri Dec 15 00:33:07 2006
@@ -2,8 +2,6 @@
 %define		_modname	PDO_FIREBIRD
 %define		_smodname	pdo_firebird
 %define		_status		beta
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 Summary:	%{_modname} - Firebird/InterBase 6 driver for PDO
 Summary(pl):	%{_modname} - sterownik do baz Firebird/InterBase 6 dla PDO
 Name:		php-pecl-%{_modname}
@@ -18,10 +16,10 @@
 BuildRequires:	Firebird-devel
 BuildRequires:	php-devel >= 3:5.0.0
 BuildRequires:	php-pecl-PDO-devel
-BuildRequires:	rpmbuild(macros) >= 1.322
+BuildRequires:	rpmbuild(macros) >= 1.344
 %{?requires_php_extension}
 %{?requires_php_pdo_module}
-Requires:	%{_sysconfdir}/conf.d
+Requires:	php-common >= 4:5.0.4
 Requires:	php-pecl-PDO
 Provides:	php(pdo-firebird)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,10 +49,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/%{_smodname}.so $RPM_BUILD_ROOT%{extensionsdir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_smodname}.ini
+install %{_modname}-%{version}/modules/%{_smodname}.so $RPM_BUILD_ROOT%{php_extensiondir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_smodname}.ini
 ; Enable %{_modname} extension module
 extension=%{_smodname}.so
 EOF
@@ -63,20 +61,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,tests}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_smodname}.ini
-%attr(755,root,root) %{extensionsdir}/%{_smodname}.so
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{_smodname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{_smodname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -84,6 +80,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2006/12/14 23:33:07  glen
+- use new php extension related macros
+
 Revision 1.18  2006/11/26 15:34:43  glen
 - rel 8: add Provides: php(%{_modname})
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-pecl-Net_Gopher.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-PDO.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-PDO_FIREBIRD.spec?r1=1.18&r2=1.19&f=u

More information about the pld-cvs-commit mailing list