Author: glen                         Date: Sun Sep 11 22:03:34 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- full conf.d support and unifications

---- Files affected:
SPECS:
   php4-pecl-APC.spec (1.5 -> 1.6) , php4-pecl-SQLite.spec (1.3 -> 1.4) , 
php4-pecl-dbx.spec (1.2 -> 1.3) , php4-pecl-http.spec (1.4 -> 1.5) , 
php4-pecl-intercept.spec (1.1 -> 1.2) , php4-pecl-mailparse.spec (1.3 -> 1.4) , 
php4-pecl-memcache.spec (1.1 -> 1.2) , php4-pecl-pop3.spec (1.1 -> 1.2) , 
php4-pecl-runkit.spec (1.2 -> 1.3) , php4-pecl-tidy.spec (1.2 -> 1.3) , 
php4-pecl-xmlwriter.spec (1.1 -> 1.2) , php4-pecl-yaz.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/php4-pecl-APC.spec
diff -u SPECS/php4-pecl-APC.spec:1.5 SPECS/php4-pecl-APC.spec:1.6
--- SPECS/php4-pecl-APC.spec:1.5        Thu Aug 25 10:36:56 2005
+++ SPECS/php4-pecl-APC.spec    Mon Sep 12 00:03:28 2005
@@ -2,25 +2,25 @@
 %define                _modname        APC
 %define                _status         stable
 %define                _sysconfdir     /etc/php4
+%define                extensionsdir   %(php-config --extension-dir 
2>/dev/null)
 
 Summary:       %{_modname} - Alternative PHP Cache
 Summary(pl):   %{_modname} - alternatywne cache PHP
 Name:          php4-pecl-%{_modname}
 Version:       3.0.8
-Release:       2
+Release:       3
 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: php4-devel >= 3:4.3.0
+BuildRequires: rpmbuild(macros) >= 1.230
 %requires_eq_to php4-common php4-devel
+Requires:      %{_sysconfdir}/conf.d
 Obsoletes:     php-pear-%{_modname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                extensionsdir   %(php-config --extension-dir 
2>/dev/null)
-
 %description
 APC is the Alternative PHP Cache. It was conceived of to provide a
 free, open, and robust framework for caching and optimizing PHP
@@ -79,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/09/11 22:03:28  glen
+- full conf.d support and unifications
+
 Revision 1.5  2005/08/25 08:36:56  glen
 - use confdir php, rel 2
 

================================================================
Index: SPECS/php4-pecl-SQLite.spec
diff -u SPECS/php4-pecl-SQLite.spec:1.3 SPECS/php4-pecl-SQLite.spec:1.4
--- SPECS/php4-pecl-SQLite.spec:1.3     Wed Jul 13 13:19:06 2005
+++ SPECS/php4-pecl-SQLite.spec Mon Sep 12 00:03:28 2005
@@ -2,26 +2,26 @@
 %define                _modname        SQLite
 %define                _status         stable
 %define                _smodname       sqlite
+%define                _sysconfdir     /etc/php4
+%define                extensionsdir   %{_libdir}/php4
 
 Summary:       %{_modname} - database bindings
 Summary(pl):   %{_modname} - powiązania z bazą danych
 Name:          php4-pecl-%{_modname}
 Version:       1.0.3
-Release:       2
+Release:       3
 License:       PHP
 Group:         Development/Languages/PHP
 Source0:       http://pecl.php.net/get/%{_modname}-%{version}.tgz
 # Source0-md5: 3741cb211f9eb3f77de086e96d232e95
 URL:           http://pecl.php.net/package/SQLite/
-BuildRequires: libtool
-BuildRequires: php4-devel >= 4.0.0
-Requires:      php-common
+BuildRequires: php4-devel >= 3:4.0.0
+BuildRequires: rpmbuild(macros) >= 1.230
+%requires_eq_to php4-common php4-devel
+Requires:      %{_sysconfdir}/conf.d
 Obsoletes:     php-pear-%{_modname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc/php4
-%define                extensionsdir   %{_libdir}/php4
-
 %description
 %{_modname} is a C library that implements an embeddable SQL database
 engine. Programs that link with the %{_modname} library can have SQL
@@ -49,25 +49,31 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd %{_modname}-%{version}
-chmod 755 build/shtool
-%{__make} install INSTALL_ROOT=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
+%{__make} -C %{_modname}-%{version} install INSTALL_ROOT=$RPM_BUILD_ROOT
+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}/php4-module-install install %{_smodname} %{_sysconfdir}/php.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 %{_smodname} 
%{_sysconfdir}/php.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 %{_modname}-%{version}/README %{_modname}-%{version}/TODO 
%{_modname}-%{version}/CREDITS
 %doc %{_modname}-%{version}/sqlite.php %{_modname}-%{version}/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"`)
@@ -76,6 +82,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/09/11 22:03:28  glen
+- full conf.d support and unifications
+
 Revision 1.3  2005/07/13 11:19:06  arekm
 - rel 2
 

================================================================
Index: SPECS/php4-pecl-dbx.spec
diff -u SPECS/php4-pecl-dbx.spec:1.2 SPECS/php4-pecl-dbx.spec:1.3
--- SPECS/php4-pecl-dbx.spec:1.2        Sat Aug 27 10:37:22 2005
+++ SPECS/php4-pecl-dbx.spec    Mon Sep 12 00:03:28 2005
@@ -1,26 +1,26 @@
 # $Revision$, $Date$
 %define                _modname        dbx
 %define                _status         stable
+%define                _sysconfdir     /etc/php4
+%define                extensionsdir   %{_libdir}/php4
 
 Summary:       %{_modname} - database abstraction functions
 Summary(pl):   %{_modname} - funkcje abstrakcji baz danych
 Name:          php4-pecl-%{_modname}
 Version:       1.1.0
-Release:       1
+Release:       2
 License:       PHP 2.02
 Group:         Development/Languages/PHP
 Source0:       http://pecl.php.net/get/%{_modname}-%{version}.tgz
 # Source0-md5: 82d1091c75e047c4a8f9aea7b279e13b
 URL:           http://pecl.php.net/package/dbx/
-BuildRequires: libtool
 BuildRequires: php4-devel >= 3:4.3.0
-Requires:      php4-common >= 3:4.3.0
+BuildRequires: rpmbuild(macros) >= 1.230
+%requires_eq_to php4-common php4-devel
+Requires:      %{_sysconfdir}/conf.d
 Obsoletes:     php-pear-%{_modname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc/php4
-%define                extensionsdir   %{_libdir}/php4
-
 %description
 The dbx module is a database abstraction layer. The dbx functions
 allow you to access all supported databases using a single calling
@@ -55,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}/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 %{_modname}-%{version}/CREDITS
+%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"`)
@@ -81,6 +88,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2005/09/11 22:03:28  glen
+- full conf.d support and unifications
+
 Revision 1.2  2005/08/27 08:37:22  qboosh
 - pl fix
 

================================================================
Index: SPECS/php4-pecl-http.spec
diff -u SPECS/php4-pecl-http.spec:1.4 SPECS/php4-pecl-http.spec:1.5
--- SPECS/php4-pecl-http.spec:1.4       Sat Sep 10 23:21:43 2005
+++ SPECS/php4-pecl-http.spec   Mon Sep 12 00:03:28 2005
@@ -9,16 +9,17 @@
 Summary(pl):   %{_modname} - rozszerzona obsługa protokołu HTTP
 Name:          php4-pecl-%{_modname}
 Version:       0.13.0
-Release:       1
+Release:       2
 License:       PHP 3.0
 Group:         Development/Languages/PHP
 Source0:       http://pecl.php.net/get/%{_fmodname}-%{version}.tgz
 # Source0-md5: 97d867fced7c93b7b6e016044faa7579
 URL:           http://pecl.php.net/package/pecl_http/
-BuildRequires: libtool
 BuildRequires: php4-devel >= 3:4.3.0
-Requires:      %{_sysconfdir}/conf.d
+BuildRequires: mhash-devel
+BuildRequires: rpmbuild(macros) >= 1.230
 %requires_eq_to php4-common php4-devel
+Requires:      %{_sysconfdir}/conf.d
 Obsoletes:     php-pear-%{_modname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -98,6 +99,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2005/09/11 22:03:28  glen
+- full conf.d support and unifications
+
 Revision 1.4  2005/09/10 21:21:43  adamg
 - updated to 0.13.0
 

================================================================
Index: SPECS/php4-pecl-intercept.spec
diff -u SPECS/php4-pecl-intercept.spec:1.1 SPECS/php4-pecl-intercept.spec:1.2
--- SPECS/php4-pecl-intercept.spec:1.1  Mon Mar 21 00:12:19 2005
+++ SPECS/php4-pecl-intercept.spec      Mon Sep 12 00:03:28 2005
@@ -1,26 +1,26 @@
 # $Revision$, $Date$
 %define                _modname        intercept
 %define                _status         alpha
+%define                _sysconfdir     /etc/php4
+%define                extensionsdir   %{_libdir}/php4
 
 Summary:       %{_modname} - intercept function/method calls
 Summary(pl):   %{_modname} - przechwytywanie wywołań funkcji/metod
 Name:          php4-pecl-%{_modname}
 Version:       0.2.0
-Release:       1
+Release:       2
 License:       PHP
 Group:         Development/Languages/PHP
 Source0:       http://pecl.php.net/get/%{_modname}-%{version}.tgz
 # Source0-md5: fd5efb4a6d54047f9e935d975403c3ba
 URL:           http://pecl.php.net/package/intercept/
-BuildRequires: libtool
 BuildRequires: php4-devel >= 4.0.0
-Requires:      php-common
+BuildRequires: rpmbuild(macros) >= 1.230
+%requires_eq_to php4-common php4-devel
+Requires:      %{_sysconfdir}/conf.d
 Obsoletes:     php-pear-%{_modname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc/php4
-%define                extensionsdir   %{_libdir}/php4
-
 %description
 Allows the user to have a user-space function called when the specified
 function is called. Support for class/object methods will be added later.
@@ -45,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/%{_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}/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 %{_modname}-%{version}/{CREDITS,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"`)
@@ -71,6 +78,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/09/11 22:03:28  glen
+- full conf.d support and unifications
+
 Revision 1.1  2005/03/20 23:12:19  adamg
 - new
-

================================================================
Index: SPECS/php4-pecl-mailparse.spec
diff -u SPECS/php4-pecl-mailparse.spec:1.3 SPECS/php4-pecl-mailparse.spec:1.4
--- SPECS/php4-pecl-mailparse.spec:1.3  Wed Sep  7 15:30:50 2005
+++ SPECS/php4-pecl-mailparse.spec      Mon Sep 12 00:03:28 2005
@@ -1,24 +1,25 @@
 # $Revision$, $Date$
 %define                _modname        mailparse
 %define                _status         stable
+%define                _sysconfdir     /etc/php4
+%define                extensionsdir   %{_libdir}/php4
 
 Summary:       Email message manipulation
 Summary(pl):   Obrabianie wiadomości E-mail
 Name:          php4-pecl-%{_modname}
 Version:       2.1.1
-Release:       0.1
+Release:       1
 License:       PHP
 Group:         Development/Languages/PHP
 Source0:       http://pecl.php.net/get/%{_modname}-%{version}.tgz
 # Source0-md5: 14c058d79f1f6c01aa53273565bd4a54
 URL:           http://pecl.php.net/package/mailparse/
 BuildRequires: php4-devel
-Requires:      php4-common
+BuildRequires: rpmbuild(macros) >= 1.230
+%requires_eq_to php4-common php4-devel
+Requires:      %{_sysconfdir}/conf.d
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc/php4
-%define                extensionsdir   %{_libdir}/php4
-
 %description
 Mailparse is an extension for parsing and working with email messages.
 It can deal with rfc822 and rfc2045 (MIME) compliant messages.
@@ -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/%{_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.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.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 %{_modname}-%{version}/CREDITS
+%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"`)
@@ -70,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/09/11 22:03:28  glen
+- full conf.d support and unifications
+
 Revision 1.3  2005/09/07 13:30:50  glen
 - php{,4}-devel already Requires: auto{make,conf}
 

================================================================
Index: SPECS/php4-pecl-memcache.spec
diff -u SPECS/php4-pecl-memcache.spec:1.1 SPECS/php4-pecl-memcache.spec:1.2
--- SPECS/php4-pecl-memcache.spec:1.1   Fri Aug  5 15:04:09 2005
+++ SPECS/php4-pecl-memcache.spec       Mon Sep 12 00:03:28 2005
@@ -1,26 +1,26 @@
 # $Revision$, $Date$
 %define                _modname        memcache
 %define                _status         stable
+%define                _sysconfdir     /etc/php4
+%define                extensionsdir   %{_libdir}/php4
 
 Summary:       %{_modname} - a memcached extension
 Summary(pl):   %{_modname} - rozszerzenie memcached
 Name:          php4-pecl-%{_modname}
 Version:       1.5
-Release:       1
+Release:       2
 License:       PHP 2.02
 Group:         Development/Languages/PHP
 Source0:       http://pecl.php.net/get/%{_modname}-%{version}.tgz
 # Source0-md5: f521dd4d3cad4ccb05d9ade4e1cc04d4
 URL:           http://pecl.php.net/package/memcached/
-BuildRequires: libtool
 BuildRequires: php4-devel >= 3:4.3.3
-Requires:      php4-common >= 3:4.3.3
+BuildRequires: rpmbuild(macros) >= 1.230
+%requires_eq_to php4-common php4-devel
+Requires:      %{_sysconfdir}/conf.d
 Obsoletes:     php4-pear-%{_modname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc/php4
-%define                extensionsdir   %{_libdir}/php4
-
 %description
 Memcached is a caching daemon designed especially for dynamic web
 applications to decrease database load by storing objects in memory.
@@ -52,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}/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 %{_modname}-%{version}/{CREDITS,README}
+%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"`)
@@ -78,6 +85,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.1  2005/08/05 13:04:09  adamg
-- new (cp from php-pecl-memcache
+Revision 1.2  2005/09/11 22:03:28  glen
+- full conf.d support and unifications
 
+Revision 1.1  2005/08/05 13:04:09  adamg
+- new (cp from php-pecl-memcache)

================================================================
Index: SPECS/php4-pecl-pop3.spec
diff -u SPECS/php4-pecl-pop3.spec:1.1 SPECS/php4-pecl-pop3.spec:1.2
--- SPECS/php4-pecl-pop3.spec:1.1       Wed Jul 27 08:53:21 2005
+++ SPECS/php4-pecl-pop3.spec   Mon Sep 12 00:03:28 2005
@@ -1,27 +1,27 @@
 # $Revision$, $Date$
 %define                _modname        pop3
 %define                _status         stable
+%define                _sysconfdir     /etc/php4
+%define                extensionsdir   %{_libdir}/php4
 
 Summary:       POP3 Client Library
 Summary(pl):   Biblioteka klienta POP3
 Name:          php4-pecl-%{_modname}
 Version:       1.0.2
-Release:       1
+Release:       2
 License:       PHP
 Group:         Development/Languages/PHP
 Source0:       http://pecl.php.net/get/%{_modname}-%{version}.tgz
 # Source0-md5: cdbe4f41aa37bcf45e651d5568f3a8d2
 URL:           http://pecl.php.net/package/POP3/
 BuildRequires: libspopc-devel
-BuildRequires: libtool
 BuildRequires: php4-devel >= 3:4.3.0
-Requires:      php4-common
+BuildRequires: rpmbuild(macros) >= 1.230
+%requires_eq_to php4-common php4-devel
+Requires:      %{_sysconfdir}/conf.d
 Obsoletes:     php-pear-%{_modname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc/php4
-%define                extensionsdir   %{_libdir}/php4
-
 %description
 The POP3 extension makes it possible for a PHP script to connect to
 and interact with a POP3 mail server. Based on libspopc
@@ -49,24 +49,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}/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 %{_modname}-%{version}/{CREDITS,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"`)
@@ -75,6 +82,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/09/11 22:03:28  glen
+- full conf.d support and unifications
+
 Revision 1.1  2005/07/27 06:53:21  adamg
 - new (cp from php-pecl-pop3)
-

================================================================
Index: SPECS/php4-pecl-runkit.spec
diff -u SPECS/php4-pecl-runkit.spec:1.2 SPECS/php4-pecl-runkit.spec:1.3
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php4-pecl-APC.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/php4-pecl-SQLite.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/php4-pecl-dbx.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/php4-pecl-http.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/php4-pecl-intercept.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/php4-pecl-mailparse.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/php4-pecl-memcache.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/php4-pecl-pop3.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/php4-pecl-runkit.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/php4-pecl-tidy.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/php4-pecl-xmlwriter.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/php4-pecl-yaz.spec?r1=1.1&r2=1.2&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to