Author: glen                         Date: Thu Jan 24 02:43:57 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %php4_webserver_restart macro

---- Files affected:
SPECS:
   php4-pecl-APC.spec (1.20 -> 1.21) , php4-pecl-SQLite.spec (1.15 -> 1.16) , 
php4-pecl-crack.spec (1.10 -> 1.11) , php4-pecl-dbx.spec (1.12 -> 1.13) , 
php4-pecl-docblock.spec (1.6 -> 1.7) , php4-pecl-expect.spec (1.4 -> 1.5) , 
php4-pecl-geoip.spec (1.5 -> 1.6) , php4-pecl-gnupg.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/php4-pecl-APC.spec
diff -u SPECS/php4-pecl-APC.spec:1.20 SPECS/php4-pecl-APC.spec:1.21
--- SPECS/php4-pecl-APC.spec:1.20       Mon May  7 22:09:49 2007
+++ SPECS/php4-pecl-APC.spec    Thu Jan 24 03:43:50 2008
@@ -14,9 +14,9 @@
 # Source0-md5: 0f452f936239b6107d3e2e5cda4f4bda
 URL:           http://pecl.php.net/package/APC/
 BuildRequires: php4-devel >= 3:4.3.0
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
 %{?requires_php_extension}
-Requires:      %{_sysconfdir}/conf.d
+Requires:      php4-common >= 3:4.4.0-3
 Obsoletes:     php-pear-%{_modname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -71,13 +71,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
+%php4_webserver_restart
 
 %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
+       %php4_webserver_restart
 fi
 
 %files
@@ -92,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2008-01-24 02:43:50  glen
+- use %php4_webserver_restart macro
+
 Revision 1.20  2007-05-07 20:09:49  arekm
 - up to 3.0.14
 

================================================================
Index: SPECS/php4-pecl-SQLite.spec
diff -u SPECS/php4-pecl-SQLite.spec:1.15 SPECS/php4-pecl-SQLite.spec:1.16
--- SPECS/php4-pecl-SQLite.spec:1.15    Tue Feb 13 09:06:40 2007
+++ SPECS/php4-pecl-SQLite.spec Thu Jan 24 03:43:51 2008
@@ -16,9 +16,9 @@
 # Source0-md5: 3741cb211f9eb3f77de086e96d232e95
 URL:           http://pecl.php.net/package/SQLite/
 BuildRequires: php4-devel >= 3:4.0.0
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
 %{?requires_php_extension}
-Requires:      %{_sysconfdir}/conf.d
+Requires:      php4-common >= 3:4.4.0-3
 Provides:      php(sqlite)
 Obsoletes:     php-pear-%{_modname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -61,13 +61,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
+%php4_webserver_restart
 
 %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
+       %php4_webserver_restart
 fi
 
 %files
@@ -83,6 +81,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2008-01-24 02:43:51  glen
+- use %php4_webserver_restart macro
+
 Revision 1.15  2007-02-13 08:06:40  glen
 - tabs in preamble
 

================================================================
Index: SPECS/php4-pecl-crack.spec
diff -u SPECS/php4-pecl-crack.spec:1.10 SPECS/php4-pecl-crack.spec:1.11
--- SPECS/php4-pecl-crack.spec:1.10     Tue Feb 13 09:06:40 2007
+++ SPECS/php4-pecl-crack.spec  Thu Jan 24 03:43:51 2008
@@ -17,9 +17,9 @@
 URL:           http://pecl.php.net/package/crack/
 BuildRequires: cracklib-devel
 BuildRequires: php4-devel
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
 %{?requires_php_extension}
-Requires:      %{_sysconfdir}/conf.d
+Requires:      php4-common >= 3:4.4.0-3
 Obsoletes:     php-crack
 Obsoletes:     php-pear-%{_modname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,13 +64,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
+%php4_webserver_restart
 
 %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
+       %php4_webserver_restart
 fi
 
 %files
@@ -85,6 +83,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2008-01-24 02:43:51  glen
+- use %php4_webserver_restart macro
+
 Revision 1.10  2007-02-13 08:06:40  glen
 - tabs in preamble
 

================================================================
Index: SPECS/php4-pecl-dbx.spec
diff -u SPECS/php4-pecl-dbx.spec:1.12 SPECS/php4-pecl-dbx.spec:1.13
--- SPECS/php4-pecl-dbx.spec:1.12       Tue Feb 13 09:06:40 2007
+++ SPECS/php4-pecl-dbx.spec    Thu Jan 24 03:43:51 2008
@@ -15,9 +15,9 @@
 # Source0-md5: 82d1091c75e047c4a8f9aea7b279e13b
 URL:           http://pecl.php.net/package/dbx/
 BuildRequires: php4-devel >= 3:4.3.0
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
 %{?requires_php_extension}
-Requires:      %{_sysconfdir}/conf.d
+Requires:      php4-common >= 3:4.4.0-3
 Obsoletes:     php-pear-%{_modname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -67,13 +67,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
+%php4_webserver_restart
 
 %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
+       %php4_webserver_restart
 fi
 
 %files
@@ -88,6 +86,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2008-01-24 02:43:51  glen
+- use %php4_webserver_restart macro
+
 Revision 1.12  2007-02-13 08:06:40  glen
 - tabs in preamble
 

================================================================
Index: SPECS/php4-pecl-docblock.spec
diff -u SPECS/php4-pecl-docblock.spec:1.6 SPECS/php4-pecl-docblock.spec:1.7
--- SPECS/php4-pecl-docblock.spec:1.6   Tue Feb 13 09:06:40 2007
+++ SPECS/php4-pecl-docblock.spec       Thu Jan 24 03:43:51 2008
@@ -15,9 +15,9 @@
 # Source0-md5: 678a888b8110a3d31ddcedd03d93bb0c
 URL:           http://pecl.php.net/package/docblock/
 BuildRequires: php4-devel >= 3:4.0.0
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
 %{?requires_php_extension}
-Requires:      %{_sysconfdir}/conf.d
+Requires:      php4-common >= 3:4.4.0-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -89,13 +89,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
+%php4_webserver_restart
 
 %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
+       %php4_webserver_restart
 fi
 
 %files
@@ -110,6 +108,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2008-01-24 02:43:51  glen
+- use %php4_webserver_restart macro
+
 Revision 1.6  2007-02-13 08:06:40  glen
 - tabs in preamble
 

================================================================
Index: SPECS/php4-pecl-expect.spec
diff -u SPECS/php4-pecl-expect.spec:1.4 SPECS/php4-pecl-expect.spec:1.5
--- SPECS/php4-pecl-expect.spec:1.4     Tue Feb 13 09:06:40 2007
+++ SPECS/php4-pecl-expect.spec Thu Jan 24 03:43:51 2008
@@ -15,9 +15,9 @@
 URL:           http://pecl.php.net/package/expect/
 BuildRequires: expect-devel
 BuildRequires: php4-devel >= 3:4.3.0
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
 %{?requires_php_extension}
-Requires:      %{_sysconfdir}/conf.d
+Requires:      php4-common >= 3:4.4.0-3
 Obsoletes:     php-pear-%{_modname}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,13 +56,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
+%php4_webserver_restart
 
 %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
+       %php4_webserver_restart
 fi
 
 %files
@@ -76,6 +74,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2008-01-24 02:43:51  glen
+- use %php4_webserver_restart macro
+
 Revision 1.4  2007-02-13 08:06:40  glen
 - tabs in preamble
 

================================================================
Index: SPECS/php4-pecl-geoip.spec
diff -u SPECS/php4-pecl-geoip.spec:1.5 SPECS/php4-pecl-geoip.spec:1.6
--- SPECS/php4-pecl-geoip.spec:1.5      Tue Feb 13 09:06:40 2007
+++ SPECS/php4-pecl-geoip.spec  Thu Jan 24 03:43:51 2008
@@ -3,7 +3,6 @@
 %define                _status         beta
 %define                _sysconfdir     /etc/php4
 %define                extensionsdir   %(php-config --extension-dir 
2>/dev/null)
-
 Summary:       %{_modname} - Map IP address to geographic places
 Summary(pl.UTF-8):     %{_modname} - odwzorowanie adresów IP w miejsca 
geograficzne
 Name:          php4-pecl-%{_modname}
@@ -16,9 +15,9 @@
 URL:           http://pecl.php.net/package/geoip/
 BuildRequires: GeoIP-devel
 BuildRequires: php4-devel >= 3:4.3.0
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
 %{?requires_php_extension}
-Requires:      %{_sysconfdir}/conf.d
+Requires:      php4-common >= 3:4.4.0-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -61,13 +60,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
+%php4_webserver_restart
 
 %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
+       %php4_webserver_restart
 fi
 
 %files
@@ -82,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2008-01-24 02:43:51  glen
+- use %php4_webserver_restart macro
+
 Revision 1.5  2007-02-13 08:06:40  glen
 - tabs in preamble
 

================================================================
Index: SPECS/php4-pecl-gnupg.spec
diff -u SPECS/php4-pecl-gnupg.spec:1.9 SPECS/php4-pecl-gnupg.spec:1.10
--- SPECS/php4-pecl-gnupg.spec:1.9      Tue Feb 13 09:06:40 2007
+++ SPECS/php4-pecl-gnupg.spec  Thu Jan 24 03:43:51 2008
@@ -3,7 +3,6 @@
 %define                _status         stable
 %define                _sysconfdir     /etc/php4
 %define                extensionsdir   %(php-config --extension-dir 
2>/dev/null)
-
 Summary:       %{_modname} - wrapper around the gpgme library
 Summary(pl.UTF-8):     %{_modname} - wrapper biblioteki gpgme
 Name:          php4-pecl-%{_modname}
@@ -16,9 +15,9 @@
 URL:           http://pecl.php.net/package/gnupg/
 BuildRequires: gpgme-devel
 BuildRequires: php4-devel >= 3:4.3.0
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
 %{?requires_php_extension}
-Requires:      %{_sysconfdir}/conf.d
+Requires:      php4-common >= 3:4.4.0-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -56,13 +55,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
+%php4_webserver_restart
 
 %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
+       %php4_webserver_restart
 fi
 
 %files
@@ -77,6 +74,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2008-01-24 02:43:51  glen
+- use %php4_webserver_restart macro
+
 Revision 1.9  2007-02-13 08:06:40  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php4-pecl-APC.spec?r1=1.20&r2=1.21&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php4-pecl-SQLite.spec?r1=1.15&r2=1.16&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php4-pecl-crack.spec?r1=1.10&r2=1.11&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php4-pecl-dbx.spec?r1=1.12&r2=1.13&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php4-pecl-docblock.spec?r1=1.6&r2=1.7&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php4-pecl-expect.spec?r1=1.4&r2=1.5&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php4-pecl-geoip.spec?r1=1.5&r2=1.6&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php4-pecl-gnupg.spec?r1=1.9&r2=1.10&f=u

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

Reply via email to