Author: glen Date: Tue Jan 2 20:10:30 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use new php extension related macros
---- Files affected:
SPECS:
php-pecl-statgrab.spec (1.18 -> 1.19) , php-pecl-stats.spec (1.7 -> 1.8) ,
php-pecl-tcpwrap.spec (1.9 -> 1.10) , php-pecl-translit.spec (1.17 -> 1.18) ,
php-pecl-uuid.spec (1.17 -> 1.18) , php-pecl-valkyrie.spec (1.8 -> 1.9)
---- Diffs:
================================================================
Index: SPECS/php-pecl-statgrab.spec
diff -u SPECS/php-pecl-statgrab.spec:1.18 SPECS/php-pecl-statgrab.spec:1.19
--- SPECS/php-pecl-statgrab.spec:1.18 Thu Dec 14 00:39:02 2006
+++ SPECS/php-pecl-statgrab.spec Tue Jan 2 21:10:21 2007
@@ -2,9 +2,6 @@
%define _modname statgrab
%define _smodname Statgrab
%define _status stable
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
-
Summary: %{_modname} - libstatgrab bindings
Summary(pl): %{_modname} - dowiązania biblioteki libstatgrab
Name: php-pecl-%{_modname}
@@ -17,9 +14,9 @@
URL: http://pecl.php.net/package/statgrab/
BuildRequires: libstatgrab-devel >= 0.10
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)
@@ -54,10 +51,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 %{_smodname}-%{version}/modules/%{_modname}.so
$RPM_BUILD_ROOT%{extensionsdir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+install %{_smodname}-%{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
@@ -66,20 +63,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 %{_smodname}-%{version}/CREDITS
-%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
@@ -87,6 +82,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.19 2007/01/02 20:10:21 glen
+- use new php extension related macros
+
Revision 1.18 2006/12/13 23:39:02 glen
- rel 2 (php 5.2.0)
================================================================
Index: SPECS/php-pecl-stats.spec
diff -u SPECS/php-pecl-stats.spec:1.7 SPECS/php-pecl-stats.spec:1.8
--- SPECS/php-pecl-stats.spec:1.7 Thu Dec 14 00:40:25 2006
+++ SPECS/php-pecl-stats.spec Tue Jan 2 21:10:21 2007
@@ -1,9 +1,6 @@
# $Revision$, $Date$
%define _modname stats
%define _status stable
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
-
Summary: %{_modname} - extension with routines for statistical
computation
Summary(pl): %{_modname} - rozszerzenie z funkcjami do wykonywania obliczeń
statystycznych
Name: php-pecl-%{_modname}
@@ -15,9 +12,9 @@
# Source0-md5: 96f105be1e76fbc5dca424057066e4d8
URL: http://pecl.php.net/package/stats/
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
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -45,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
@@ -57,21 +54,19 @@
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,TODO}
%doc %{_modname}-%{version}/tests
-%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
@@ -79,6 +74,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2007/01/02 20:10:21 glen
+- use new php extension related macros
+
Revision 1.7 2006/12/13 23:40:25 glen
- rel 2 (php 5.2.0)
================================================================
Index: SPECS/php-pecl-tcpwrap.spec
diff -u SPECS/php-pecl-tcpwrap.spec:1.9 SPECS/php-pecl-tcpwrap.spec:1.10
--- SPECS/php-pecl-tcpwrap.spec:1.9 Fri Nov 3 00:09:09 2006
+++ SPECS/php-pecl-tcpwrap.spec Tue Jan 2 21:10:21 2007
@@ -1,8 +1,6 @@
# $Revision$, $Date$
%define _modname tcpwrap
%define _status stable
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - tcpwrapper bindings
Summary(pl): %{_modname} - dowiązania tcpwrapper
Name: php-pecl-%{_modname}
@@ -15,9 +13,9 @@
URL: http://pecl.php.net/package/tcpwrap/
BuildRequires: libwrap-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)
@@ -43,10 +41,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
@@ -55,20 +53,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
@@ -76,6 +72,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.10 2007/01/02 20:10:21 glen
+- use new php extension related macros
+
Revision 1.9 2006/11/02 23:09:09 glen
- BR rpmmacros for fixed %requires_php_extension
================================================================
Index: SPECS/php-pecl-translit.spec
diff -u SPECS/php-pecl-translit.spec:1.17 SPECS/php-pecl-translit.spec:1.18
--- SPECS/php-pecl-translit.spec:1.17 Thu Dec 14 00:45:47 2006
+++ SPECS/php-pecl-translit.spec Tue Jan 2 21:10:21 2007
@@ -1,8 +1,6 @@
# $Revision$, $Date$
%define _modname translit
%define _status beta
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - transliterates non-latin character sets to latin
Summary(pl): %{_modname} - translitacja alfabetów niełacińskich do
łacińskiego
Name: php-pecl-%{_modname}
@@ -14,9 +12,9 @@
# Source0-md5: a22fc5ad0ee0686b3aafd642bae9ec31
URL: http://pecl.php.net/package/translit/
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)
@@ -53,10 +51,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
@@ -65,19 +63,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
@@ -85,6 +81,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2007/01/02 20:10:21 glen
+- use new php extension related macros
+
Revision 1.17 2006/12/13 23:45:47 glen
- rel 6 (php 5.2.0)
================================================================
Index: SPECS/php-pecl-uuid.spec
diff -u SPECS/php-pecl-uuid.spec:1.17 SPECS/php-pecl-uuid.spec:1.18
--- SPECS/php-pecl-uuid.spec:1.17 Thu Dec 14 00:48:54 2006
+++ SPECS/php-pecl-uuid.spec Tue Jan 2 21:10:21 2007
@@ -1,8 +1,6 @@
# $Revision$, $Date$
%define _modname uuid
%define _status stable
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - UUID support functions
Summary(pl): %{_modname} - funkcje obsługujące UUID
Name: php-pecl-%{_modname}
@@ -15,9 +13,9 @@
URL: http://pecl.php.net/package/uuid/
BuildRequires: libuuid-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)
@@ -48,10 +46,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
@@ -60,19 +58,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
@@ -80,6 +76,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2007/01/02 20:10:21 glen
+- use new php extension related macros
+
Revision 1.17 2006/12/13 23:48:54 glen
- rel 6 (php 5.2.0)
================================================================
Index: SPECS/php-pecl-valkyrie.spec
diff -u SPECS/php-pecl-valkyrie.spec:1.8 SPECS/php-pecl-valkyrie.spec:1.9
--- SPECS/php-pecl-valkyrie.spec:1.8 Fri Nov 3 00:09:09 2006
+++ SPECS/php-pecl-valkyrie.spec Tue Jan 2 21:10:21 2007
@@ -3,8 +3,6 @@
# doesn't build
%define _modname valkyrie
%define _status alpha
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - POST and GET validation extension
Summary(pl): %{_modname} - rozszerzenie kontrolujące poprawność POST i GET
Name: php-pecl-%{_modname}
@@ -17,9 +15,9 @@
URL: http://pecl.php.net/package/valkyrie/
BuildRequires: libxml2-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)
@@ -50,10 +48,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
@@ -62,20 +60,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
@@ -83,6 +79,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.9 2007/01/02 20:10:21 glen
+- use new php extension related macros
+
Revision 1.8 2006/11/02 23:09:09 glen
- BR rpmmacros for fixed %requires_php_extension
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php-pecl-statgrab.spec?r1=1.18&r2=1.19&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-stats.spec?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-tcpwrap.spec?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-translit.spec?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-uuid.spec?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-valkyrie.spec?r1=1.8&r2=1.9&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
