SPECS: php-pecl-APC.spec, php-pecl-Net_Gopher.spec, php-pecl-PDO.s...

glen glen at pld-linux.org
Mon Sep 12 01:53:29 CEST 2005


Author: glen                         Date: Sun Sep 11 23:53:28 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- full conf.d support and unifications

---- Files affected:
SPECS:
   php-pecl-APC.spec (1.9 -> 1.10) , php-pecl-Net_Gopher.spec (1.6 -> 1.7) , php-pecl-PDO.spec (1.5 -> 1.6) , php-pecl-PDO_FIREBIRD.spec (1.5 -> 1.6) , php-pecl-PDO_MYSQL.spec (1.3 -> 1.4) , php-pecl-PDO_OCI.spec (1.2 -> 1.3) , php-pecl-PDO_ODBC.spec (1.4 -> 1.5) , php-pecl-PDO_PGSQL.spec (1.2 -> 1.3) , php-pecl-PDO_SQLITE.spec (1.4 -> 1.5) , php-pecl-apd.spec (1.5 -> 1.6) , php-pecl-archive.spec (1.3 -> 1.4) , php-pecl-bcompiler.spec (1.13 -> 1.14) , php-pecl-big_int.spec (1.5 -> 1.6) , php-pecl-bitset.spec (1.1 -> 1.2) , php-pecl-bz2.spec (1.9 -> 1.10) , php-pecl-bz2_filter.spec (1.1 -> 1.2) , php-pecl-classkit.spec (1.5 -> 1.6) , php-pecl-clips.spec (1.3 -> 1.4) , php-pecl-cpdf.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/php-pecl-APC.spec
diff -u SPECS/php-pecl-APC.spec:1.9 SPECS/php-pecl-APC.spec:1.10
--- SPECS/php-pecl-APC.spec:1.9	Thu Aug 25 10:05:42 2005
+++ SPECS/php-pecl-APC.spec	Mon Sep 12 01:53:22 2005
@@ -1,26 +1,26 @@
 # $Revision$, $Date$
 %define		_modname	APC
 %define		_status		stable
+%define		_sysconfdir	/etc/php
+%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 
 Summary:	%{_modname} - Alternative PHP Cache
 Summary(pl):	%{_modname} - alternatywne cache PHP
 Name:		php-pecl-%{_modname}
 Version:	3.0.8
-Release:	1
+Release:	2
 License:	PHP
 Group:		Development/Languages/PHP
 Source0:	http://pecl.php.net/get/%{_modname}-%{version}.tgz
 # Source0-md5:	a70a14a00275e551e8085f742322433f
 URL:		http://pecl.php.net/package/APC/
-BuildRequires:	libtool
-BuildRequires:	php-devel
-Requires:	php-common
+BuildRequires:	php-devel >= 3:5.0.0
+BuildRequires:	rpmbuild(macros) >= 1.230
+%requires_eq_to php-common php-devel
+Requires:	%{_sysconfdir}/conf.d
 Obsoletes:	php-pear-%{_modname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%{_libdir}/php
-
 %description
 APC is the Alternative PHP Cache. It was conceived of to provide a
 free, open, and robust framework for caching and optimizing PHP
@@ -46,24 +46,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{extensionsdir}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
 
 install %{_modname}-%{version}/modules/apc.so $RPM_BUILD_ROOT%{extensionsdir}/%{_modname}.so
+cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+; Enable %{_modname} extension module
+extension=%{_modname}.so
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini
+[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
+[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
 
-%preun
-if [ "$1" = "0" ]; then
-	%{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini
+%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
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc %{_modname}-%{version}/{CHANGELOG,INSTALL,NOTICE}
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini
 %attr(755,root,root) %{extensionsdir}/%{_modname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -72,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/09/11 23:53:22  glen
+- full conf.d support and unifications
+
 Revision 1.9  2005/08/25 08:05:42  adamg
 - updated to 3.0.8
 

================================================================
Index: SPECS/php-pecl-Net_Gopher.spec
diff -u SPECS/php-pecl-Net_Gopher.spec:1.6 SPECS/php-pecl-Net_Gopher.spec:1.7
--- SPECS/php-pecl-Net_Gopher.spec:1.6	Sun Mar 20 20:00:36 2005
+++ SPECS/php-pecl-Net_Gopher.spec	Mon Sep 12 01:53:22 2005
@@ -2,26 +2,26 @@
 %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}
 Version:	1.0.0
-Release:	1
+Release:	2
 License:	PHP
 Group:		Development/Languages/PHP
 Source0:	http://pecl.php.net/get/%{_modname}-%{version}.tgz
 # Source0-md5:	85435fc2d8f067558acc81c33a453d83
 URL:		http://pecl.php.net/package/Net_Gopher/
-BuildRequires:	libtool
-BuildRequires:	php-devel
-Requires:	php-common
+BuildRequires:	php-devel >= 3:5.0.0
+BuildRequires:	rpmbuild(macros) >= 1.230
+%requires_eq_to php-common php-devel
+Requires:	%{_sysconfdir}/conf.d
 Obsoletes:	php-pear-%{_modname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%{_libdir}/php
-
 %description
 fopen wrapper for retrieving documents via gopher protocol. Includes
 additional function for parsing gopher directory entries.
@@ -46,23 +46,20 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{extensionsdir}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
 
 install %{_modname}-%{version}/modules/%{_smodname}.so $RPM_BUILD_ROOT%{extensionsdir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_smodname}.ini
+; Enable %{_modname} extension module
+extension=%{_smodname}.so
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%{_sbindir}/php-module-install install %{_smodname} %{_sysconfdir}/php-cgi.ini
-
-%preun
-if [ "$1" = "0" ]; then
-	%{_sbindir}/php-module-install remove %{_smodname} %{_sysconfdir}/php-cgi.ini
-fi
-
 %files
 %defattr(644,root,root,755)
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_smodname}.ini
 %attr(755,root,root) %{extensionsdir}/%{_smodname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -71,6 +68,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/09/11 23:53:22  glen
+- full conf.d support and unifications
+
 Revision 1.6  2005/03/20 19:00:36  adamg
 - updated to 1.0.0
 
@@ -89,4 +89,3 @@
 
 Revision 1.1  2003/07/07 22:08:44  adamg
 - initial import
-

================================================================
Index: SPECS/php-pecl-PDO.spec
diff -u SPECS/php-pecl-PDO.spec:1.5 SPECS/php-pecl-PDO.spec:1.6
--- SPECS/php-pecl-PDO.spec:1.5	Sun Mar 20 20:01:01 2005
+++ SPECS/php-pecl-PDO.spec	Mon Sep 12 01:53:22 2005
@@ -1,26 +1,26 @@
 # $Revision$, $Date$
 %define		_modname	PDO
 %define		_status		beta
+%define		_sysconfdir	/etc/php
+%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 
 Summary:	%{_modname} - PHP Data Objects Interface
 Summary(pl):	%{_modname} - PHP-owy Interfejs Obiektów Danych
 Name:		php-pecl-%{_modname}
 Version:	0.3
-Release:	1
+Release:	2
 License:	PHP
 Group:		Development/Languages/PHP
 Source0:	http://pecl.php.net/get/%{_modname}-%{version}.tgz
 # Source0-md5:	5a0ad6ce920091798b2656244cad71a9
 URL:		http://pecl.php.net/package/PDO/
-BuildRequires:	libtool
-BuildRequires:	php-devel
-Requires:	php-common
+BuildRequires:	php-devel >= 3:5.0.0
+BuildRequires:	rpmbuild(macros) >= 1.230
+%requires_eq_to php-common php-devel
+Requires:	%{_sysconfdir}/conf.d
 Obsoletes:	php-pear-%{_modname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%{_libdir}/php
-
 %description
 PDO provides a uniform data access interface, sporting advanced
 features such as prepared statements and bound parameters. PDO drivers
@@ -61,26 +61,32 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{extensionsdir},%{_includedir}/php/ext/pdo}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir},%{_includedir}/php/ext/pdo}
 
 install %{_modname}-%{version}/modules/pdo.so $RPM_BUILD_ROOT%{extensionsdir}/%{_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
+; Enable %{_modname} extension module
+extension=%{_modname}.so
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini
+[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
+[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
 
-%preun
-if [ "$1" = "0" ]; then
-	%{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini
+%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
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc %{_modname}-%{version}/{CREDITS,README,TODO}
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini
 %attr(755,root,root) %{extensionsdir}/%{_modname}.so
 
 %files devel
@@ -93,6 +99,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/09/11 23:53:22  glen
+- full conf.d support and unifications
+
 Revision 1.5  2005/03/20 19:01:01  adamg
 - updated to 0.3 (beta)
 

================================================================
Index: SPECS/php-pecl-PDO_FIREBIRD.spec
diff -u SPECS/php-pecl-PDO_FIREBIRD.spec:1.5 SPECS/php-pecl-PDO_FIREBIRD.spec:1.6
--- SPECS/php-pecl-PDO_FIREBIRD.spec:1.5	Sun Feb 20 19:43:33 2005
+++ SPECS/php-pecl-PDO_FIREBIRD.spec	Mon Sep 12 01:53:22 2005
@@ -2,12 +2,14 @@
 %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}
 Version:	0.2
-Release:	2
+Release:	3
 License:	PHP 2.02
 Group:		Development/Languages/PHP
 Source0:	http://pecl.php.net/get/%{_modname}-%{version}.tgz
@@ -16,16 +18,15 @@
 URL:		http://pecl.php.net/package/PDO_FIREBIRD/
 BuildRequires:	Firebird-devel
 BuildRequires:	libtool
-BuildRequires:	php-devel
 BuildRequires:	php-pecl-PDO-devel
-Requires:	php-common
+BuildRequires:	php-devel >= 3:5.0.0
+BuildRequires:	rpmbuild(macros) >= 1.230
+%requires_eq_to php-common php-devel
+Requires:	%{_sysconfdir}/conf.d
 Requires:	php-pecl-PDO
 Obsoletes:	php-pear-%{_modname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%{_libdir}/php
-
 %description
 This extension provides a Firebird/InterBase driver for PDO. It
 supports all versions of Firebird and InterBase versions 6 and up.
@@ -51,24 +52,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{extensionsdir}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
 
 install %{_modname}-%{version}/modules/%{_smodname}.so $RPM_BUILD_ROOT%{extensionsdir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_smodname}.ini
+; Enable %{_modname} extension module
+extension=%{_smodname}.so
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_sbindir}/php-module-install install %{_smodname} %{_sysconfdir}/php-cgi.ini
+[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
+[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
 
-%preun
-if [ "$1" = "0" ]; then
-	%{_sbindir}/php-module-install remove %{_smodname} %{_sysconfdir}/php-cgi.ini
+%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
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc %{_modname}-%{version}/{CREDITS,tests}
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_smodname}.ini
 %attr(755,root,root) %{extensionsdir}/%{_smodname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -77,6 +85,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/09/11 23:53:22  glen
+- full conf.d support and unifications
+
 Revision 1.5  2005/02/20 18:43:33  qboosh
 - pl fix
 

================================================================
Index: SPECS/php-pecl-PDO_MYSQL.spec
diff -u SPECS/php-pecl-PDO_MYSQL.spec:1.3 SPECS/php-pecl-PDO_MYSQL.spec:1.4
--- SPECS/php-pecl-PDO_MYSQL.spec:1.3	Sun Feb 20 19:44:29 2005
+++ SPECS/php-pecl-PDO_MYSQL.spec	Mon Sep 12 01:53:22 2005
@@ -2,29 +2,29 @@
 %define		_modname	PDO_MYSQL
 %define		_smodname	pdo_mysql
 %define		_status		beta
+%define		_sysconfdir	/etc/php
+%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 
 Summary:	%{_modname} - MySQL 3.x/4.0 driver for PDO
 Summary(pl):	%{_modname} - sterownik do bazy MySQL 3.x/4.0 dla PDO
 Name:		php-pecl-%{_modname}
 Version:	0.2
-Release:	1
+Release:	2
 License:	PHP
 Group:		Development/Languages/PHP
 Source0:	http://pecl.php.net/get/%{_modname}-%{version}.tgz
 # Source0-md5:	496fd626077a594bffc97b65a2cb44d9
 URL:		http://pecl.php.net/package/PDO_MYSQL/
-BuildRequires:	libtool
 BuildRequires:	mysql-devel
-BuildRequires:	php-devel
 BuildRequires:	php-pecl-PDO-devel
-Requires:	php-common
+BuildRequires:	php-devel >= 3:5.0.0
+BuildRequires:	rpmbuild(macros) >= 1.230
+%requires_eq_to php-common php-devel
+Requires:	%{_sysconfdir}/conf.d
 Requires:	php-pecl-PDO
 Obsoletes:	php-pear-%{_modname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%{_libdir}/php
-
 %description
 This extension provides a MySQL 3.x/4.0 driver for PDO.
 
@@ -46,24 +46,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{extensionsdir}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
 
 install %{_modname}-%{version}/modules/%{_smodname}.so $RPM_BUILD_ROOT%{extensionsdir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_smodname}.ini
+; Enable %{_modname} extension module
+extension=%{_smodname}.so
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_sbindir}/php-module-install install %{_smodname} %{_sysconfdir}/php-cgi.ini
+[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
+[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
 
-%preun
-if [ "$1" = "0" ]; then
-	%{_sbindir}/php-module-install remove %{_smodname} %{_sysconfdir}/php-cgi.ini
+%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
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc %{_modname}-%{version}/CREDITS
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_smodname}.ini
 %attr(755,root,root) %{extensionsdir}/%{_smodname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -72,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/09/11 23:53:22  glen
+- full conf.d support and unifications
+
 Revision 1.3  2005/02/20 18:44:29  qboosh
 - pl fix
 

================================================================
Index: SPECS/php-pecl-PDO_OCI.spec
diff -u SPECS/php-pecl-PDO_OCI.spec:1.2 SPECS/php-pecl-PDO_OCI.spec:1.3
--- SPECS/php-pecl-PDO_OCI.spec:1.2	Sun Feb 20 19:46:13 2005
+++ SPECS/php-pecl-PDO_OCI.spec	Mon Sep 12 01:53:22 2005
@@ -2,7 +2,10 @@
 %define		_modname	PDO_OCI
 %define		_smodname	pdo_oci
 %define		_status		beta
+%define		_sysconfdir	/etc/php
+%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 
+# NOTE: needs ORACLE_HOME env var to build
 Summary:	%{_modname} - Oracle Call Interface driver for PDO
 Summary(pl):	%{_modname} - sterownik Oracle Call Interface dla PDO
 Name:		php-pecl-%{_modname}
@@ -13,16 +16,14 @@
 Source0:	http://pecl.php.net/get/%{_modname}-%{version}.tgz
 # Source0-md5:	a7978a0ffda9d371d5a5dd861ab66f96
 URL:		http://pecl.php.net/package/PDO_OCI/
-BuildRequires:	libtool
-BuildRequires:	php-devel
 BuildRequires:	php-pecl-PDO-devel
-Requires:	php-common
+BuildRequires:	php-devel >= 3:5.0.0
+BuildRequires:	rpmbuild(macros) >= 1.230
+%requires_eq_to php-common php-devel
+Requires:	%{_sysconfdir}/conf.d
 Obsoletes:	php-pear-%{_modname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%{_libdir}/php
-
 %description
 This extension provides an Oracle driver for PDO.
 
@@ -44,24 +45,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{extensionsdir}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
 
 install %{_modname}-%{version}/modules/%{_smodname}.so $RPM_BUILD_ROOT%{extensionsdir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_smodname}.ini
+; Enable %{_modname} extension module
+extension=%{_smodname}.so
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_sbindir}/php-module-install install %{_smodname} %{_sysconfdir}/php-cgi.ini
+[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
+[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
 
-%preun
-if [ "$1" = "0" ]; then
-	%{_sbindir}/php-module-install remove %{_smodname} %{_sysconfdir}/php-cgi.ini
+%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
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc %{_modname}-%{version}/CREDITS
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_modname}.ini
 %attr(755,root,root) %{extensionsdir}/%{_smodname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -70,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2005/09/11 23:53:22  glen
+- full conf.d support and unifications
+
 Revision 1.2  2005/02/20 18:46:13  qboosh
 - pl fix
 

================================================================
Index: SPECS/php-pecl-PDO_ODBC.spec
diff -u SPECS/php-pecl-PDO_ODBC.spec:1.4 SPECS/php-pecl-PDO_ODBC.spec:1.5
--- SPECS/php-pecl-PDO_ODBC.spec:1.4	Sun Feb 20 19:57:18 2005
+++ SPECS/php-pecl-PDO_ODBC.spec	Mon Sep 12 01:53:22 2005
@@ -2,29 +2,29 @@
 %define		_modname	PDO_ODBC
 %define		_smodname	pdo_odbc
 %define		_status		beta
+%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}
 Version:	0.2
-Release:	1
+Release:	2
 License:	PHP
 Group:		Development/Languages/PHP
 Source0:	http://pecl.php.net/get/%{_modname}-%{version}.tgz
 # Source0-md5:	d172ca070968ada26be5710b7fbdbed3
 URL:		http://pecl.php.net/package/PDO_ODBC/
-BuildRequires:	libtool
-BuildRequires:	php-devel
 BuildRequires:	php-pecl-PDO-devel
 BuildRequires:	unixODBC-devel
-Requires:	php-common
+BuildRequires:	php-devel >= 3:5.0.0
+BuildRequires:	rpmbuild(macros) >= 1.230
+%requires_eq_to php-common php-devel
+Requires:	%{_sysconfdir}/conf.d
 Requires:	php-pecl-PDO
 Obsoletes:	php-pear-%{_modname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%{_libdir}/php
-
 %description
 This extension provides an ODBC v3 driver for PDO. It supports
 unixODBC and IBM DB2 libraries, and will support more in future
@@ -51,24 +51,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{extensionsdir}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
 
 install %{_modname}-%{version}/modules/%{_smodname}.so $RPM_BUILD_ROOT%{extensionsdir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_smodname}.ini
+; Enable %{_modname} extension module
+extension=%{_smodname}.so
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_sbindir}/php-module-install install %{_smodname} %{_sysconfdir}/php-cgi.ini
+[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
+[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
 
-%preun
-if [ "$1" = "0" ]; then
-	%{_sbindir}/php-module-install remove %{_smodname} %{_sysconfdir}/php-cgi.ini
+%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
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc %{_modname}-%{version}/CREDITS
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/%{_smodname}.ini
 %attr(755,root,root) %{extensionsdir}/%{_smodname}.so
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-pecl-APC.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-Net_Gopher.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-PDO.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-PDO_FIREBIRD.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-PDO_MYSQL.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-PDO_OCI.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-PDO_ODBC.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-PDO_PGSQL.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-PDO_SQLITE.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-apd.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-archive.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-bcompiler.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-big_int.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-bitset.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-bz2.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-bz2_filter.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-classkit.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-clips.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-cpdf.spec?r1=1.2&r2=1.3&f=u




More information about the pld-cvs-commit mailing list