Author: glen Date: Wed Dec 20 00:08:53 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use new php extension related macros
---- Files affected:
SPECS:
php-pecl-esmtp.spec (1.13 -> 1.14) , php-pecl-event.spec (1.11 -> 1.12) ,
php-pecl-expect.spec (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SPECS/php-pecl-esmtp.spec
diff -u SPECS/php-pecl-esmtp.spec:1.13 SPECS/php-pecl-esmtp.spec:1.14
--- SPECS/php-pecl-esmtp.spec:1.13 Fri Nov 3 00:09:09 2006
+++ SPECS/php-pecl-esmtp.spec Wed Dec 20 01:08:48 2006
@@ -18,8 +18,6 @@
#(gdb)
%define _modname esmtp
%define _status alpha
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - ESMTP client extension
Summary(pl): %{_modname} - klient ESMTP
Name: php-pecl-%{_modname}
@@ -34,10 +32,10 @@
URL: http://pecl.php.net/package/esmtp/
BuildRequires: libesmtp-devel >= 1.0.3r1
BuildRequires: php-devel >= 3:5.0.0
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
BuildRequires: fix-crash
%{?requires_php_extension}
-Requires: %{_sysconfdir}/conf.d
+Requires: php-common >= 4:5.0.4
Obsoletes: php-pear-%{_modname}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -82,10 +80,10 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
+install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}}
-install %{_modname}-%{version}/modules/%{_modname}.so
$RPM_BUILD_ROOT%{extensionsdir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+install %{_modname}-%{version}/modules/%{_modname}.so
$RPM_BUILD_ROOT%{php_extensiondir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
; Enable %{_modname} extension module
extension=%{_modname}.so
EOF
@@ -94,20 +92,18 @@
rm -rf $RPM_BUILD_ROOT
%post
-[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+%php_webserver_restart
%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
+ %php_webserver_restart
fi
%files
%defattr(644,root,root,755)
%doc %{_modname}-%{version}/{CREDITS,NOTES,TODO}
-%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/%{_modname}.ini
-%attr(755,root,root) %{extensionsdir}/%{_modname}.so
+%config(noreplace) %verify(not md5 mtime size)
%{php_sysconfdir}/conf.d/%{_modname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{_modname}.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -115,6 +111,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2006/12/20 00:08:48 glen
+- use new php extension related macros
+
Revision 1.13 2006/11/02 23:09:09 glen
- BR rpmmacros for fixed %requires_php_extension
================================================================
Index: SPECS/php-pecl-event.spec
diff -u SPECS/php-pecl-event.spec:1.11 SPECS/php-pecl-event.spec:1.12
--- SPECS/php-pecl-event.spec:1.11 Wed Dec 13 23:25:17 2006
+++ SPECS/php-pecl-event.spec Wed Dec 20 01:08:48 2006
@@ -1,8 +1,6 @@
# $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ń
Name: php-pecl-%{_modname}
@@ -14,9 +12,9 @@
# Source0-md5: f009fd3519c14a027a8c85414208b61c
URL: http://pecl.php.net/package/event/
BuildRequires: php-devel >= 3:5.0.0
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
%{?requires_php_extension}
-Requires: %{_sysconfdir}/conf.d
+Requires: php-common >= 4:5.0.4
Obsoletes: php-pear-%{_modname}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,10 +49,10 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
+install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}}
-install %{_modname}-%{version}/modules/%{_modname}.so
$RPM_BUILD_ROOT%{extensionsdir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+install %{_modname}-%{version}/modules/%{_modname}.so
$RPM_BUILD_ROOT%{php_extensiondir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
; Enable %{_modname} extension module
extension=%{_modname}.so
EOF
@@ -63,20 +61,18 @@
rm -rf $RPM_BUILD_ROOT
%post
-[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+%php_webserver_restart
%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
+ %php_webserver_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
+%config(noreplace) %verify(not md5 mtime size)
%{php_sysconfdir}/conf.d/%{_modname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{_modname}.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -84,6 +80,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.12 2006/12/20 00:08:48 glen
+- use new php extension related macros
+
Revision 1.11 2006/12/13 22:25:17 glen
- rel 6 (php 5.2.0)
================================================================
Index: SPECS/php-pecl-expect.spec
diff -u SPECS/php-pecl-expect.spec:1.5 SPECS/php-pecl-expect.spec:1.6
--- SPECS/php-pecl-expect.spec:1.5 Wed Dec 13 23:26:28 2006
+++ SPECS/php-pecl-expect.spec Wed Dec 20 01:08:48 2006
@@ -1,8 +1,6 @@
# $Revision$, $Date$
%define _modname expect
%define _status beta
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - PHP extension for expect library
Summary(pl): %{_modname} - rozszerzenie PHP dla biblioteki expect
Name: php-pecl-%{_modname}
@@ -15,9 +13,9 @@
URL: http://pecl.php.net/package/expect/
BuildRequires: expect-devel
BuildRequires: php-devel >= 3:5.0.0
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
%{?requires_php_extension}
-Requires: %{_sysconfdir}/conf.d
+Requires: php-common >= 4:5.0.4
Obsoletes: php-pear-%{_modname}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -44,10 +42,10 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
+install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}}
-install %{_modname}-%{version}/modules/%{_modname}.so
$RPM_BUILD_ROOT%{extensionsdir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+install %{_modname}-%{version}/modules/%{_modname}.so
$RPM_BUILD_ROOT%{php_extensiondir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
; Enable %{_modname} extension module
extension=%{_modname}.so
EOF
@@ -56,19 +54,17 @@
rm -rf $RPM_BUILD_ROOT
%post
-[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+%php_webserver_restart
%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
+ %php_webserver_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
+%config(noreplace) %verify(not md5 mtime size)
%{php_sysconfdir}/conf.d/%{_modname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{_modname}.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -76,6 +72,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2006/12/20 00:08:48 glen
+- use new php extension related macros
+
Revision 1.5 2006/12/13 22:26:28 glen
- update to 0.2.2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php-pecl-esmtp.spec?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-event.spec?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-expect.spec?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
