SPECS: php-pecl-http.spec, php4-pecl-http.spec - updated to 0.12.0...

Fri Aug 26 17:52:34 CEST 2005

Author: adamg                        Date: Fri Aug 26 15:52:34 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 0.12.0
- switched to conf.d

---- Files affected:
SPECS:
   php-pecl-http.spec (1.7 -> 1.8) , php4-pecl-http.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/php-pecl-http.spec
diff -u SPECS/php-pecl-http.spec:1.7 SPECS/php-pecl-http.spec:1.8

--- SPECS/php-pecl-http.spec:1.7	Wed Jul 27 08:59:16 2005
+++ SPECS/php-pecl-http.spec	Fri Aug 26 17:52:28 2005
@@ -6,21 +6,22 @@
 Summary:	%{_modname} - extended HTTP support
 Summary(pl):	%{_modname} - rozszerzona obsługa protokołu HTTP
 Name:		php-pecl-%{_modname}
-Version:	0.10.1
+Version:	0.12.0
 Release:	1
 License:	PHP 3.0
 Group:		Development/Languages/PHP
 Source0:	http://pecl.php.net/get/%{_fmodname}-%{version}.tgz
-# Source0-md5:	63967a512656acfbc1dcd7cb521f2527
+# Source0-md5:	d180e5b95d22c911e40d8265f7c8fd96
 URL:		http://pecl.php.net/package/pecl_http/
 BuildRequires:	libtool
 BuildRequires:	php-devel >= 3:5.0.0
-Requires:	php-common >= 3:5.0.0
+Requires:	%{_sysconfdir}/conf.d
+%requires_eq_to php-common php-devel
 Obsoletes:	php-pear-%{_modname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/php
-%define		extensionsdir	%{_libdir}/php
+%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 
 %description
 Currently implemented features:
@@ -65,24 +66,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{extensionsdir}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
 
 install %{_fmodname}-%{version}/modules/%{_modname}.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_php4.conf ] || %service -q apache restart
+[ ! -f /etc/httpd/httpd.conf/??_mod_php4.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_php4.conf ] || %service -q apache restart
+        [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc %{_fmodname}-%{version}/{docs,EXPERIMENTAL}
+%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"`)
@@ -91,6 +99,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2005/08/26 15:52:28  adamg
+- updated to 0.12.0
+- switched to conf.d
+
 Revision 1.7  2005/07/27 06:59:16  adamg
 - updated to 0.10.1
 

================================================================
Index: SPECS/php4-pecl-http.spec
diff -u SPECS/php4-pecl-http.spec:1.1 SPECS/php4-pecl-http.spec:1.2
--- SPECS/php4-pecl-http.spec:1.1	Wed Jul 27 09:04:39 2005
+++ SPECS/php4-pecl-http.spec	Fri Aug 26 17:52:28 2005
@@ -6,21 +6,22 @@
 Summary:	%{_modname} - extended HTTP support
 Summary(pl):	%{_modname} - rozszerzona obsługa protokołu HTTP
 Name:		php4-pecl-%{_modname}
-Version:	0.10.1
+Version:	0.12.0
 Release:	1
 License:	PHP 3.0
 Group:		Development/Languages/PHP
 Source0:	http://pecl.php.net/get/%{_fmodname}-%{version}.tgz
-# Source0-md5:	63967a512656acfbc1dcd7cb521f2527
+# Source0-md5:	d180e5b95d22c911e40d8265f7c8fd96
 URL:		http://pecl.php.net/package/pecl_http/
 BuildRequires:	libtool
 BuildRequires:	php4-devel >= 3:4.3.0
-Requires:	php4-common >= 3:4.3.0
+Requires:	%{_sysconfdir}/conf.d
+%requires_eq_to php4-common php4-devel
 Obsoletes:	php-pear-%{_modname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/php4
-%define		extensionsdir	%{_libdir}/php4
+%define		extensionsdir	%(php4-config --extension-dir 2>/dev/null)
 
 %description
 Currently implemented features:
@@ -65,24 +66,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{extensionsdir}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
 
 install %{_fmodname}-%{version}/modules/%{_modname}.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}/php4-module-install install %{_modname} %{_sysconfdir}/php-cgi.ini
+[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
+[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
 
-%preun
-if [ "$1" = "0" ]; then
-	%{_sbindir}/php4-module-install remove %{_modname} %{_sysconfdir}/php-cgi.ini
+%postun
+if [ "$1" = 0 ]; then
+	[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
+	[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc %{_fmodname}-%{version}/{docs,EXPERIMENTAL}
+%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"`)
@@ -91,6 +99,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/26 15:52:28  adamg
+- updated to 0.12.0
+- switched to conf.d
+
 Revision 1.1  2005/07/27 07:04:39  adamg
 - new (cp from php-pecl-http)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-pecl-http.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/php4-pecl-http.spec?r1=1.1&r2=1.2&f=u


