Author: glen Date: Tue Jan 2 20:07:01 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use new php extension related macros
---- Files affected:
SPECS:
php-pecl-rpmreader.spec (1.7 -> 1.8) , php-pecl-runkit.spec (1.10 -> 1.11) ,
php-pecl-sasl.spec (1.16 -> 1.17) , php-pecl-session_mysql.spec (1.7 -> 1.8) ,
php-pecl-ssh2.spec (1.14 -> 1.15)
---- Diffs:
================================================================
Index: SPECS/php-pecl-rpmreader.spec
diff -u SPECS/php-pecl-rpmreader.spec:1.7 SPECS/php-pecl-rpmreader.spec:1.8
--- SPECS/php-pecl-rpmreader.spec:1.7 Thu Dec 14 00:30:25 2006
+++ SPECS/php-pecl-rpmreader.spec Tue Jan 2 21:06:52 2007
@@ -1,9 +1,6 @@
# $Revision$, $Date$
%define _modname rpmreader
%define _status beta
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
-
Summary: %{_modname} - RPM file meta information reader
Summary(pl): %{_modname} - odczyt metainformacji z plików RPM
Name: php-pecl-%{_modname}
@@ -15,9 +12,9 @@
# Source0-md5: 73aca25e6f5b7b17dffe4dfb63110505
URL: http://pecl.php.net/package/rpmreader/
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
@@ -47,10 +44,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
@@ -59,20 +56,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,examples}
-%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 +75,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2007/01/02 20:06:52 glen
+- use new php extension related macros
+
Revision 1.7 2006/12/13 23:30:25 glen
- rel 3 (php 5.2.0)
================================================================
Index: SPECS/php-pecl-runkit.spec
diff -u SPECS/php-pecl-runkit.spec:1.10 SPECS/php-pecl-runkit.spec:1.11
--- SPECS/php-pecl-runkit.spec:1.10 Fri Nov 3 00:09:09 2006
+++ SPECS/php-pecl-runkit.spec Tue Jan 2 21:06:52 2007
@@ -1,8 +1,6 @@
# $Revision$, $Date$
%define _modname runkit
%define _status beta
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - mangle with user defined functions and classes
Summary(pl): %{_modname} - obróbka zdefiniowanych przez użytkownika funkcji
i klas
Name: php-pecl-%{_modname}
@@ -14,9 +12,9 @@
# Source0-md5: 855786f79a3803972b04e44c32cece8d
URL: http://pecl.php.net/package/runkit/
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)
@@ -46,10 +44,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
@@ -58,20 +56,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}/README
-%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 +75,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.11 2007/01/02 20:06:52 glen
+- use new php extension related macros
+
Revision 1.10 2006/11/02 23:09:09 glen
- BR rpmmacros for fixed %requires_php_extension
================================================================
Index: SPECS/php-pecl-sasl.spec
diff -u SPECS/php-pecl-sasl.spec:1.16 SPECS/php-pecl-sasl.spec:1.17
--- SPECS/php-pecl-sasl.spec:1.16 Thu Dec 14 00:35:36 2006
+++ SPECS/php-pecl-sasl.spec Tue Jan 2 21:06:52 2007
@@ -1,8 +1,6 @@
# $Revision$, $Date$
%define _modname sasl
%define _status alpha
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - Cyrus SASL extension
Summary(pl): %{_modname} - rozszerzenie Cyrus SASL
Name: php-pecl-%{_modname}
@@ -17,9 +15,9 @@
URL: http://pecl.php.net/package/sasl/
BuildRequires: cyrus-sasl-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)
@@ -65,10 +63,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
@@ -77,20 +75,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}/docs/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
@@ -98,6 +94,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.17 2007/01/02 20:06:52 glen
+- use new php extension related macros
+
Revision 1.16 2006/12/13 23:35:36 glen
- rel 7 (php 5.2.0)
================================================================
Index: SPECS/php-pecl-session_mysql.spec
diff -u SPECS/php-pecl-session_mysql.spec:1.7
SPECS/php-pecl-session_mysql.spec:1.8
--- SPECS/php-pecl-session_mysql.spec:1.7 Tue Nov 21 20:48:04 2006
+++ SPECS/php-pecl-session_mysql.spec Tue Jan 2 21:06:52 2007
@@ -1,8 +1,5 @@
# $Revision$, $Date$
%define _modname session_mysql
-%define _status stable
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: MySQL session save handler for PHP
Summary(pl): Obsługa zapisywania sesji w bazie MySQL dla PHP
Name: php-pecl-%{_modname}
@@ -19,9 +16,9 @@
URL: http://websupport.sk/~stanojr/projects/session_mysql/
BuildRequires: mysql-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
Requires: php(mysql)
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,29 +48,27 @@
%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 modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+install modules/%{_modname}.so $RPM_BUILD_ROOT%{php_extensiondir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
%clean
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 LICENCE README database.sql
-%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
@@ -81,6 +76,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2007/01/02 20:06:52 glen
+- use new php extension related macros
+
Revision 1.7 2006/11/21 19:48:04 glen
- really do
================================================================
Index: SPECS/php-pecl-ssh2.spec
diff -u SPECS/php-pecl-ssh2.spec:1.14 SPECS/php-pecl-ssh2.spec:1.15
--- SPECS/php-pecl-ssh2.spec:1.14 Thu Dec 14 00:38:04 2006
+++ SPECS/php-pecl-ssh2.spec Tue Jan 2 21:06:52 2007
@@ -1,8 +1,6 @@
# $Revision$, $Date$
%define _modname ssh2
%define _status beta
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - bindings for the libssh2 library
Summary(pl): %{_modname} - dowiązania do biblioteki libssh2
Name: php-pecl-%{_modname}
@@ -16,9 +14,9 @@
BuildRequires: libssh2-devel >= 0.5
BuildRequires: openssl-devel >= 0.9.7d
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)
@@ -45,10 +43,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,19 +55,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
@@ -77,6 +73,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2007/01/02 20:06:52 glen
+- use new php extension related macros
+
Revision 1.14 2006/12/13 23:38:04 glen
- update to 0.10
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php-pecl-rpmreader.spec?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-runkit.spec?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-sasl.spec?r1=1.16&r2=1.17&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-session_mysql.spec?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-ssh2.spec?r1=1.14&r2=1.15&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
