SPECS: php-pecl-dbx.spec, php-pecl-dio.spec, php-pecl-event.spec, ...

glen glen at pld-linux.org
Wed Sep 14 15:37:23 CEST 2005


Author: glen                         Date: Wed Sep 14 13:37:23 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- conf.d and php api macros

---- Files affected:
SPECS:
   php-pecl-dbx.spec (1.3 -> 1.4) , php-pecl-dio.spec (1.3 -> 1.4) , php-pecl-event.spec (1.4 -> 1.5) , php-pecl-fann.spec (1.3 -> 1.4) , php-pecl-fileinfo.spec (1.5 -> 1.6) , php-pecl-fribidi.spec (1.8 -> 1.9) , php-pecl-html_parse.spec (1.6 -> 1.7) , php-pecl-huffman.spec (1.5 -> 1.6) , php-pecl-id3.spec (1.4 -> 1.5) , php-pecl-idn.spec (1.5 -> 1.6) , php-pecl-imagick.spec (1.21 -> 1.22) , php-pecl-lzf.spec (1.6 -> 1.7) , php-pecl-mailparse.spec (1.12 -> 1.13) , php-pecl-mcrypt_filter.spec (1.3 -> 1.4) , php-pecl-memcache.spec (1.9 -> 1.10) , php-pecl-mono.spec (1.10 -> 1.11) , php-pecl-namazu.spec (1.2 -> 1.3) , php-pecl-netools.spec (1.12 -> 1.13) , php-pecl-newt.spec (1.8 -> 1.9) , php-pecl-odbtp.spec (1.9 -> 1.10) , php-pecl-oggvorbis.spec (1.7 -> 1.8) , php-pecl-openal.spec (1.6 -> 1.7) , php-pecl-parsekit.spec (1.8 -> 1.9) , php-pecl-pdflib.spec (1.4 -> 1.5) , php-pecl-pop3.spec (1.6 -> 1.7) , php-pecl-ps.spec (1.3 -> 1.4) , php-pecl-python.spec (1.14 -> 1.15) , php-pecl-radius.spec (1.16 -> 1.17) , php-pecl-rar.spec (1.5 -> 1.6) , php-pecl-runkit.spec (1.3 -> 1.4) , php-pecl-sasl.spec (1.9 -> 1.10) , php-pecl-ssh2.spec (1.7 -> 1.8) , php-pecl-statgrab.spec (1.9 -> 1.10) , php-pecl-tcpwrap.spec (1.6 -> 1.7) , php-pecl-tidy.spec (1.10 -> 1.11) , php-pecl-translit.spec (1.10 -> 1.11) , php-pecl-uuid.spec (1.10 -> 1.11) , php-pecl-valkyrie.spec (1.5 -> 1.6) , php-pecl-vld.spec (1.8 -> 1.9) , php-pecl-xattr.spec (1.4 -> 1.5) , php-pecl-xdiff.spec (1.14 -> 1.15) , php-pecl-xmlwriter.spec (1.6 -> 1.7) , php-pecl-xmms.spec (1.5 -> 1.6) , php-pecl-yaz.spec (1.9 -> 1.10) , php-pecl-zip.spec (1.11 -> 1.12) , php-pecl-zlib_filter.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/php-pecl-dbx.spec
diff -u SPECS/php-pecl-dbx.spec:1.3 SPECS/php-pecl-dbx.spec:1.4
--- SPECS/php-pecl-dbx.spec:1.3	Tue Sep 13 23:16:43 2005
+++ SPECS/php-pecl-dbx.spec	Wed Sep 14 15:37:00 2005
@@ -1,6 +1,8 @@
 # $Revision$, $Date$
 %define		_modname	dbx
 %define		_status		stable
+%define		_sysconfdir	/etc/php
+%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 
 Summary:	%{_modname} - database abstraction functions
 Summary(pl):	%{_modname} - funkcje abstrakcji baz danych
@@ -13,13 +15,12 @@
 # Source0-md5:	82d1091c75e047c4a8f9aea7b279e13b
 URL:		http://pecl.php.net/package/dbx/
 BuildRequires:	php-devel >= 3:5.0.0
-Requires:	php-common >= 3:5.0.0
+BuildRequires:	rpmbuild(macros) >= 1.238
+%{?requires_php_extension}
+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
 The dbx module is a database abstraction layer. The dbx functions
 allow you to access all supported databases using a single calling
@@ -54,24 +55,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/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}
+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
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_modname}.ini
 %attr(755,root,root) %{extensionsdir}/%{_modname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -80,6 +88,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/09/14 13:37:00  glen
+- conf.d and php api macros
+
 Revision 1.3  2005/09/13 21:16:43  glen
 - superfluous BR libtool removed
 

================================================================
Index: SPECS/php-pecl-dio.spec
diff -u SPECS/php-pecl-dio.spec:1.3 SPECS/php-pecl-dio.spec:1.4
--- SPECS/php-pecl-dio.spec:1.3	Tue Sep 13 23:16:43 2005
+++ SPECS/php-pecl-dio.spec	Wed Sep 14 15:37:00 2005
@@ -1,6 +1,8 @@
 # $Revision$, $Date$
 %define		_modname	dio
 %define		_status		stable
+%define		_sysconfdir	/etc/php
+%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 
 Summary:	%{_modname} - Direct I/O functions
 Summary(pl):	%{_modname} - funkcje bezpośredniego we/wy
@@ -14,12 +16,11 @@
 URL:		http://pecl.php.net/package/dio/
 BuildRequires:	libxml2-devel
 BuildRequires:	php-devel >= 3:5.0.0
-Requires:	php-common >= 3:5.0.0
+BuildRequires:	rpmbuild(macros) >= 1.238
+%{?requires_php_extension}
+Requires:	%{_sysconfdir}/conf.d
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%{_libdir}/php
-
 %description
 PHP supports the direct I/O functions as described in the Posix
 Standard (Section 6) for performing I/O functions at a lower level
@@ -52,23 +53,30 @@
 
 %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/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}
+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)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_modname}.ini
 %attr(755,root,root) %{extensionsdir}/%{_modname}.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.4  2005/09/14 13:37:00  glen
+- conf.d and php api macros
+
 Revision 1.3  2005/09/13 21:16:43  glen
 - superfluous BR libtool removed
 

================================================================
Index: SPECS/php-pecl-event.spec
diff -u SPECS/php-pecl-event.spec:1.4 SPECS/php-pecl-event.spec:1.5
--- SPECS/php-pecl-event.spec:1.4	Tue Sep 13 23:16:43 2005
+++ SPECS/php-pecl-event.spec	Wed Sep 14 15:37:00 2005
@@ -1,6 +1,8 @@
 # $Revision$, $Date$
 %define		_modname	event
 %define		_status		beta
+%define		_sysconfdir	/etc/php
+%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 
 Summary:	%{_modname} - event scheduling engine
 Summary(pl):	%{_modname} - silnik do planowania zdarzeń
@@ -13,13 +15,12 @@
 # Source0-md5:	f009fd3519c14a027a8c85414208b61c
 URL:		http://pecl.php.net/package/event/
 BuildRequires:	php-devel >= 3:5.0.0
-Requires:	php-common >= 3:5.0.0
+BuildRequires:	rpmbuild(macros) >= 1.238
+%{?requires_php_extension}
+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 is an extension to efficiently schedule IO, time and signal based
 events using the best available IO notification mechanism for your
@@ -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/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}
+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,EXPERIMENTAL}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_modname}.ini
 %attr(755,root,root) %{extensionsdir}/%{_modname}.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.5  2005/09/14 13:37:00  glen
+- conf.d and php api macros
+
 Revision 1.4  2005/09/13 21:16:43  glen
 - superfluous BR libtool removed
 

================================================================
Index: SPECS/php-pecl-fann.spec
diff -u SPECS/php-pecl-fann.spec:1.3 SPECS/php-pecl-fann.spec:1.4
--- SPECS/php-pecl-fann.spec:1.3	Tue Sep 13 23:16:43 2005
+++ SPECS/php-pecl-fann.spec	Wed Sep 14 15:37:00 2005
@@ -1,6 +1,8 @@
 # $Revision$, $Date$
 %define		_modname	fann
 %define		_status		devel
+%define		_sysconfdir	/etc/php
+%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 
 Summary:	%{_modname} - artificial neural networks
 Summary(pl):	%{_modname} - sztuczne sieci neuronowe
@@ -13,14 +15,13 @@
 # Source0-md5:	5eb404da7dd1a9cec74a0ed8b5b82d47
 URL:		http://pecl.php.net/package/fann/
 BuildRequires:	fann-devel
-BuildRequires:	php-devel
-Requires:	php-common
+BuildRequires:	php-devel >= 3:5.0.0
+BuildRequires:	rpmbuild(macros) >= 1.238
+%{?requires_php_extension}
+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
 Fann (fast artificial neural network library) implements multilayer
 feedforward networks with support for both fully connected and sparse
@@ -47,24 +48,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/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}
+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,EXPERIMENTAL}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_modname}.ini
 %attr(755,root,root) %{extensionsdir}/%{_modname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -73,6 +81,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/09/14 13:37:00  glen
+- conf.d and php api macros
+
 Revision 1.3  2005/09/13 21:16:43  glen
 - superfluous BR libtool removed
 

================================================================
Index: SPECS/php-pecl-fileinfo.spec
diff -u SPECS/php-pecl-fileinfo.spec:1.5 SPECS/php-pecl-fileinfo.spec:1.6
--- SPECS/php-pecl-fileinfo.spec:1.5	Tue Sep 13 23:16:43 2005
+++ SPECS/php-pecl-fileinfo.spec	Wed Sep 14 15:37:00 2005
@@ -1,7 +1,11 @@
 # $Revision$, $Date$
+# TODO:
+# doesn't build
 %define		_modname	fileinfo
 %define		_smodname	Fileinfo
 %define		_status		beta
+%define		_sysconfdir	/etc/php
+%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 
 Summary:	%{_modname} - libmagic bindings
 Summary(pl):	%{_modname} - dowiązania biblioteki libmagic
@@ -14,13 +18,12 @@
 # Source0-md5:	e228172c2486c4866c1242d752bae54d
 URL:		http://pecl.php.net/package/Fileinfo/
 BuildRequires:	php-devel >= 3:5.0.0
-Requires:	php-common
+BuildRequires:	rpmbuild(macros) >= 1.238
+%{?requires_php_extension}
+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 allows retrieval of information regarding vast majority
 of file. This information may include dimensions, quality, length
@@ -52,24 +55,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{extensionsdir}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
 
 install %{_smodname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}
+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 %{_smodname}-%{version}/{CREDITS,EXPERIMENTAL}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_modname}.ini
 %attr(755,root,root) %{extensionsdir}/%{_modname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -78,6 +88,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/09/14 13:37:00  glen
+- conf.d and php api macros
+
 Revision 1.5  2005/09/13 21:16:43  glen
 - superfluous BR libtool removed
 

================================================================
Index: SPECS/php-pecl-fribidi.spec
diff -u SPECS/php-pecl-fribidi.spec:1.8 SPECS/php-pecl-fribidi.spec:1.9
--- SPECS/php-pecl-fribidi.spec:1.8	Tue Sep 13 23:16:43 2005
+++ SPECS/php-pecl-fribidi.spec	Wed Sep 14 15:37:00 2005
@@ -1,11 +1,14 @@
 # $Revision$, $Date$
 %define		_modname	fribidi
 %define		_status		stable
+%define		_sysconfdir	/etc/php
+%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
+
 Summary:	%{_modname} - Implementation of the Unicode BiDi algorithm
 Summary(pl):	%{_modname} - Implementacja algorytmu BiDi Unicode
 Name:		php-pecl-%{_modname}
 Version:	1.0
-Release:	2
+Release:	2.1
 License:	PHP
 Group:		Development/Languages/PHP
 Source0:	http://pecl.php.net/get/%{_modname}-%{version}.tgz
@@ -13,14 +16,13 @@
 URL:		http://pecl.php.net/package/fribidi/
 BuildRequires:	fribidi-devel
 BuildRequires:	php-devel >= 3:5.0.0
-Requires:	php-common >= 3:5.0.0
+BuildRequires:	rpmbuild(macros) >= 1.238
+%{?requires_php_extension}
+Requires:	%{_sysconfdir}/conf.d
 Obsoletes:	php-fribidi
 Obsoletes:	php-pear-%{_modname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%{_libdir}/php
-
 %description
 A PHP frontend to the FriBidi library: an implemntation of the unicode
 Bidi algorithm, provides means of handling right-to-left text.
@@ -45,23 +47,30 @@
 
 %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/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}
+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)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_modname}.ini
 %attr(755,root,root) %{extensionsdir}/%{_modname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -70,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/09/14 13:37:00  glen
+- conf.d and php api macros
+
 Revision 1.8  2005/09/13 21:16:43  glen
 - superfluous BR libtool removed
 

================================================================
Index: SPECS/php-pecl-html_parse.spec
diff -u SPECS/php-pecl-html_parse.spec:1.6 SPECS/php-pecl-html_parse.spec:1.7
--- SPECS/php-pecl-html_parse.spec:1.6	Tue Sep 13 23:16:43 2005
+++ SPECS/php-pecl-html_parse.spec	Wed Sep 14 15:37:00 2005
@@ -1,6 +1,9 @@
 # $Revision$, $Date$
 %define		_modname	html_parse
 %define		_status		alpha
+%define		_sysconfdir	/etc/php
+%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
+
 Summary:	%{_modname} - HTML parser extension
 Summary(pl):	%{_modname} - parser HTML
 Name:		php-pecl-%{_modname}
@@ -12,14 +15,13 @@
 # Source0-md5:	cb6035c83d7902708e64b180ee2a1499
 URL:		http://pecl.php.net/package/html_parse/
 BuildRequires:	ekhtml-devel
-BuildRequires:	php-devel
-Requires:	php-common
+BuildRequires:	php-devel >= 3:5.0.0
+BuildRequires:	rpmbuild(macros) >= 1.238
+%{?requires_php_extension}
+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
 HTML parser extension based on the ekhtml library
 (http://ekhtml.sourceforge.net/)
@@ -43,23 +45,30 @@
 
 %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/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}
+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)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_modname}.ini
 %attr(755,root,root) %{extensionsdir}/%{_modname}.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -68,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/09/14 13:37:00  glen
+- conf.d and php api macros
+
 Revision 1.6  2005/09/13 21:16:43  glen
 - superfluous BR libtool removed
 
@@ -86,4 +98,3 @@
 
 Revision 1.1  2003/07/11 21:23:57  adamg
 - initial import
-

================================================================
Index: SPECS/php-pecl-huffman.spec
diff -u SPECS/php-pecl-huffman.spec:1.5 SPECS/php-pecl-huffman.spec:1.6
--- SPECS/php-pecl-huffman.spec:1.5	Tue Sep 13 23:16:43 2005
+++ SPECS/php-pecl-huffman.spec	Wed Sep 14 15:37:00 2005
@@ -1,25 +1,26 @@
 # $Revision$, $Date$
 %define		_modname	huffman
 %define		_status		stable
+%define		_sysconfdir	/etc/php
+%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 
 Summary:	%{_modname} - lossless compression algorithm
 Summary(pl):	%{_modname} - bezstratny algorytm kompresji
 Name:		php-pecl-%{_modname}
 Version:	0.2.0
-Release:	1
+Release:	1.1
 License:	PHP
 Group:		Development/Languages/PHP
 Source0:	http://pecl.php.net/get/%{_modname}-%{version}.tgz
 # Source0-md5:	e920b06610fb3b6ad1d79dc910962dc3
 URL:		http://pecl.php.net/package/huffman/
 BuildRequires:	php-devel >= 3:5.0.0
-Requires:	php-common >= 3:5.0.0
+BuildRequires:	rpmbuild(macros) >= 1.238
+%{?requires_php_extension}
+Requires:	%{_sysconfdir}/conf.d
 Obsoletes:	php-pear-%{_modname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%{_libdir}/php
-
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-pecl-dbx.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-dio.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-event.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-fann.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-fileinfo.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-fribidi.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-html_parse.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-huffman.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-id3.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-idn.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-imagick.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-lzf.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-mailparse.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-mcrypt_filter.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-memcache.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-mono.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-namazu.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-netools.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-newt.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-odbtp.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-oggvorbis.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-openal.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-parsekit.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-pdflib.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-pop3.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-ps.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-python.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-radius.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-rar.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-runkit.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-sasl.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-ssh2.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-statgrab.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-tcpwrap.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-tidy.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-translit.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-uuid.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-valkyrie.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-vld.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-xattr.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-xdiff.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-xmlwriter.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-xmms.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-yaz.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-zip.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/php-pecl-zlib_filter.spec?r1=1.4&r2=1.5&f=u




More information about the pld-cvs-commit mailing list