SPECS: php-pecl-PDO_ODBC.spec, php-pecl-PDO_PGSQL.spec, php-pecl-P...

glen glen at pld-linux.org
Fri Dec 15 00:42:22 CET 2006 

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

---- Files affected:
SPECS:
   php-pecl-PDO_ODBC.spec (1.16 -> 1.17) , php-pecl-PDO_PGSQL.spec (1.17 -> 1.18) , php-pecl-PDO_SQLITE.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/php-pecl-PDO_ODBC.spec
diff -u SPECS/php-pecl-PDO_ODBC.spec:1.16 SPECS/php-pecl-PDO_ODBC.spec:1.17
--- SPECS/php-pecl-PDO_ODBC.spec:1.16	Sun Nov 26 16:34:25 2006
+++ SPECS/php-pecl-PDO_ODBC.spec	Fri Dec 15 00:42:16 2006
@@ -2,8 +2,6 @@
 %define		_modname	PDO_ODBC
 %define		_smodname	pdo_odbc
 %define		_status		stable
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 Summary:	%{_modname} - ODBC v3 Interface driver for PDO
 Summary(pl):	%{_modname} - sterownik do interfejsu ODBC v3 dla PDO
 Name:		php-pecl-%{_modname}
@@ -15,13 +13,12 @@
 # Source0-md5:	7f355fb5547f965d360e3f6c619039e0
 URL:		http://pecl.php.net/package/PDO_ODBC/
 BuildRequires:	php-devel >= 3:5.0.0
-BuildRequires:	php-pecl-PDO
 BuildRequires:	php-pecl-PDO-devel
-BuildRequires:	rpmbuild(macros) >= 1.322
+BuildRequires:	rpmbuild(macros) >= 1.344
 BuildRequires:	unixODBC-devel
 %{?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-odbc)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,10 +50,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
@@ -65,20 +62,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/%{_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
@@ -86,6 +81,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/12/14 23:42:16  glen
+- use new php extension related macros
+
 Revision 1.16  2006/11/26 15:34:25  glen
 - rel 2: add Provides: php(%{_modname})
 

================================================================
Index: SPECS/php-pecl-PDO_PGSQL.spec
diff -u SPECS/php-pecl-PDO_PGSQL.spec:1.17 SPECS/php-pecl-PDO_PGSQL.spec:1.18
--- SPECS/php-pecl-PDO_PGSQL.spec:1.17	Sun Nov 26 16:34:32 2006
+++ SPECS/php-pecl-PDO_PGSQL.spec	Fri Dec 15 00:42:16 2006
@@ -2,8 +2,6 @@
 %define		_modname	PDO_PGSQL
 %define		_smodname	pdo_pgsql
 %define		_status		stable
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 Summary:	%{_modname} - PostgreSQL driver for PDO
 Summary(pl):	%{_modname} - sterownik PostgreSQL dla PDO
 Name:		php-pecl-%{_modname}
@@ -17,10 +15,10 @@
 BuildRequires:	php-devel >= 3:5.0.3
 BuildRequires:	php-pecl-PDO-devel >= 1.0.3
 BuildRequires:	postgresql-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 >= 1.0.3
 Provides:	php(pdo-pgsql)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -47,10 +45,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
@@ -59,20 +57,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/%{_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
@@ -80,6 +76,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2006/12/14 23:42:16  glen
+- use new php extension related macros
+
 Revision 1.17  2006/11/26 15:34:32  glen
 - rel 3: add Provides: php(%{_modname})
 

================================================================
Index: SPECS/php-pecl-PDO_SQLITE.spec
diff -u SPECS/php-pecl-PDO_SQLITE.spec:1.16 SPECS/php-pecl-PDO_SQLITE.spec:1.17
--- SPECS/php-pecl-PDO_SQLITE.spec:1.16	Sun Nov 26 16:34:25 2006
+++ SPECS/php-pecl-PDO_SQLITE.spec	Fri Dec 15 00:42:16 2006
@@ -2,8 +2,6 @@
 %define		_modname	PDO_SQLITE
 %define		_smodname	pdo_sqlite
 %define		_status		stable
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 Summary:	%{_modname} - SQLite v3 Interface driver for PDO
 Summary(pl):	%{_modname} - sterownik do bazy SQLite v3 Interface dla PDO
 Name:		php-pecl-%{_modname}
@@ -16,11 +14,11 @@
 URL:		http://pecl.php.net/package/PDO_SQLITE/
 BuildRequires:	php-devel >= 3:5.0.0
 BuildRequires:	php-pecl-PDO-devel
-BuildRequires:	rpmbuild(macros) >= 1.322
+BuildRequires:	rpmbuild(macros) >= 1.344
 BuildRequires:	sqlite3-devel
 %{?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-sqlite)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,10 +56,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
@@ -70,20 +68,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/%{_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
@@ -91,6 +87,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/12/14 23:42:16  glen
+- use new php extension related macros
+
 Revision 1.16  2006/11/26 15:34:25  glen
 - rel 2: add Provides: php(%{_modname})
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-pecl-PDO_ODBC.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-PDO_PGSQL.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-PDO_SQLITE.spec?r1=1.16&r2=1.17&f=u

More information about the pld-cvs-commit mailing list