Author: glen Date: Thu Dec 28 13:41:21 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use new php extension related macros
---- Files affected:
SPECS:
php-pecl-fann.spec (1.6 -> 1.7) , php-pecl-fileinfo.spec (1.14 -> 1.15) ,
php-pecl-filter.spec (1.10 -> 1.11) , php-pecl-fribidi.spec (1.15 -> 1.16) ,
php-pecl-gnupg.spec (1.9 -> 1.10) , php-pecl-html_parse.spec (1.9 -> 1.10) ,
php-pecl-http.spec (1.25 -> 1.26) , php-pecl-huffman.spec (1.12 -> 1.13) ,
php-pecl-id3.spec (1.11 -> 1.12) , php-pecl-idn.spec (1.8 -> 1.9)
---- Diffs:
================================================================
Index: SPECS/php-pecl-fann.spec
diff -u SPECS/php-pecl-fann.spec:1.6 SPECS/php-pecl-fann.spec:1.7
--- SPECS/php-pecl-fann.spec:1.6 Fri Nov 3 00:09:09 2006
+++ SPECS/php-pecl-fann.spec Thu Dec 28 14:41:15 2006
@@ -1,8 +1,6 @@
# $Revision$, $Date$
%define _modname fann
%define _status devel
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - artificial neural networks
Summary(pl): %{_modname} - sztuczne sieci neuronowe
Name: php-pecl-%{_modname}
@@ -15,9 +13,9 @@
URL: http://pecl.php.net/package/fann/
BuildRequires: fann-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)
@@ -47,10 +45,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 +57,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
@@ -80,6 +76,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2006/12/28 13:41:15 glen
+- use new php extension related macros
+
Revision 1.6 2006/11/02 23:09:09 glen
- BR rpmmacros for fixed %requires_php_extension
================================================================
Index: SPECS/php-pecl-fileinfo.spec
diff -u SPECS/php-pecl-fileinfo.spec:1.14 SPECS/php-pecl-fileinfo.spec:1.15
--- SPECS/php-pecl-fileinfo.spec:1.14 Wed Dec 13 23:27:14 2006
+++ SPECS/php-pecl-fileinfo.spec Thu Dec 28 14:41:15 2006
@@ -2,9 +2,6 @@
%define _modname fileinfo
%define _smodname Fileinfo
%define _status beta
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
-
Summary: %{_modname} - libmagic bindings
Summary(pl): %{_modname} - dowiązania biblioteki libmagic
Name: php-pecl-%{_modname}
@@ -17,9 +14,9 @@
URL: http://pecl.php.net/package/Fileinfo/
BuildRequires: libmagic-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)
@@ -53,10 +50,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 %{_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,20 +62,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,EXPERIMENTAL,fileinfo.php}
-%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
@@ -86,6 +81,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2006/12/28 13:41:15 glen
+- use new php extension related macros
+
Revision 1.14 2006/12/13 22:27:14 glen
- rel 2 (php 5.2.0)
================================================================
Index: SPECS/php-pecl-filter.spec
diff -u SPECS/php-pecl-filter.spec:1.10 SPECS/php-pecl-filter.spec:1.11
--- SPECS/php-pecl-filter.spec:1.10 Tue Dec 26 15:26:32 2006
+++ SPECS/php-pecl-filter.spec Thu Dec 28 14:41:15 2006
@@ -1,8 +1,6 @@
# $Revision$, $Date$
%define _modname filter
%define _status beta
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - extension for safely dealing with input parameters
Summary(pl): %{_modname} - rozszerzenie do bezpiecznej obsługi danych
wejściowych
Name: php-pecl-%{_modname}
@@ -15,9 +13,9 @@
URL: http://pecl.php.net/package/filter/
BuildRequires: pcre-devel
BuildRequires: php-devel >= 3:5.1.5-2
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
%{?requires_php_extension}
-Requires: %{_sysconfdir}/conf.d
+Requires: php-common >= 4:5.0.4
Provides: php(filter)
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
-%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.11 2006/12/28 13:41:15 glen
+- use new php extension related macros
+
Revision 1.10 2006/12/26 14:26:32 adamg
- release 2 (rebuild agains php-5.2
================================================================
Index: SPECS/php-pecl-fribidi.spec
diff -u SPECS/php-pecl-fribidi.spec:1.15 SPECS/php-pecl-fribidi.spec:1.16
--- SPECS/php-pecl-fribidi.spec:1.15 Wed Dec 13 23:29:13 2006
+++ SPECS/php-pecl-fribidi.spec Thu Dec 28 14:41:15 2006
@@ -1,8 +1,6 @@
# $Revision$, $Date$
%define _modname fribidi
%define _status stable
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - Implementation of the Unicode BiDi algorithm
Summary(pl): %{_modname} - Implementacja algorytmu BiDi Unicode
Name: php-pecl-%{_modname}
@@ -15,9 +13,9 @@
URL: http://pecl.php.net/package/fribidi/
BuildRequires: fribidi-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-fribidi
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,19 +56,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
@@ -78,6 +74,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.16 2006/12/28 13:41:15 glen
+- use new php extension related macros
+
Revision 1.15 2006/12/13 22:29:13 glen
- rel 7 (php 5.2.0)
================================================================
Index: SPECS/php-pecl-gnupg.spec
diff -u SPECS/php-pecl-gnupg.spec:1.9 SPECS/php-pecl-gnupg.spec:1.10
--- SPECS/php-pecl-gnupg.spec:1.9 Wed Dec 13 23:30:12 2006
+++ SPECS/php-pecl-gnupg.spec Thu Dec 28 14:41:15 2006
@@ -1,9 +1,6 @@
# $Revision$, $Date$
%define _modname gnupg
%define _status stable
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
-
Summary: %{_modname} - wrapper around the gpgme library
Summary(pl): %{_modname} - wrapper biblioteki gpgme
Name: php-pecl-%{_modname}
@@ -16,9 +13,9 @@
URL: http://pecl.php.net/package/gnupg/
BuildRequires: gpgme-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
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -44,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
@@ -56,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}/{EXPERIMENTAL,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
@@ -77,6 +72,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.10 2006/12/28 13:41:15 glen
+- use new php extension related macros
+
Revision 1.9 2006/12/13 22:30:12 glen
- rel 2 (php 5.2.0)
================================================================
Index: SPECS/php-pecl-html_parse.spec
diff -u SPECS/php-pecl-html_parse.spec:1.9 SPECS/php-pecl-html_parse.spec:1.10
--- SPECS/php-pecl-html_parse.spec:1.9 Fri Nov 3 00:09:09 2006
+++ SPECS/php-pecl-html_parse.spec Thu Dec 28 14:41:15 2006
@@ -1,8 +1,6 @@
# $Revision$, $Date$
%define _modname html_parse
%define _status alpha
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - HTML parser extension
Summary(pl): %{_modname} - parser HTML
Name: php-pecl-%{_modname}
@@ -15,9 +13,9 @@
URL: http://pecl.php.net/package/html_parse/
BuildRequires: ekhtml-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.10 2006/12/28 13:41:15 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-http.spec
diff -u SPECS/php-pecl-http.spec:1.25 SPECS/php-pecl-http.spec:1.26
--- SPECS/php-pecl-http.spec:1.25 Wed Dec 13 23:32:00 2006
+++ SPECS/php-pecl-http.spec Thu Dec 28 14:41:15 2006
@@ -2,9 +2,6 @@
%define _modname http
%define _fmodname pecl_http
%define _status stable
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
-
Summary: %{_modname} - extended HTTP support
Summary(pl): %{_modname} - rozszerzona obsługa protokołu HTTP
Name: php-pecl-%{_modname}
@@ -18,10 +15,10 @@
BuildRequires: curl-devel >= 7.12.3
BuildRequires: openssl-devel
BuildRequires: php-devel >= 3:5.0.0
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
BuildRequires: zlib-devel >= 1.2.0.4
-Requires: %{_sysconfdir}/conf.d
%{?requires_php_extension}
+Requires: php-common >= 4:5.0.4
Obsoletes: php-pear-%{_modname}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -95,10 +92,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 %{_fmodname}-%{version}/modules/%{_modname}.so
$RPM_BUILD_ROOT%{extensionsdir}/%{_modname}.so
-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
@@ -107,20 +104,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 %{_fmodname}-%{version}/{KnownIssues.txt,docs}
-%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
@@ -128,6 +123,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.26 2006/12/28 13:41:15 glen
+- use new php extension related macros
+
Revision 1.25 2006/12/13 22:32:00 glen
- rel 2 (php 5.2.0)
================================================================
Index: SPECS/php-pecl-huffman.spec
diff -u SPECS/php-pecl-huffman.spec:1.12 SPECS/php-pecl-huffman.spec:1.13
--- SPECS/php-pecl-huffman.spec:1.12 Wed Dec 13 23:33:06 2006
+++ SPECS/php-pecl-huffman.spec Thu Dec 28 14:41:15 2006
@@ -1,8 +1,6 @@
# $Revision$, $Date$
%define _modname huffman
%define _status stable
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - lossless compression algorithm
Summary(pl): %{_modname} - bezstratny algorytm kompresji
Name: php-pecl-%{_modname}
@@ -14,9 +12,9 @@
# Source0-md5: e920b06610fb3b6ad1d79dc910962dc3
URL: http://pecl.php.net/package/huffman/
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,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
@@ -84,6 +80,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.13 2006/12/28 13:41:15 glen
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php-pecl-fann.spec?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-fileinfo.spec?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-filter.spec?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-fribidi.spec?r1=1.15&r2=1.16&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-gnupg.spec?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-html_parse.spec?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-http.spec?r1=1.25&r2=1.26&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-huffman.spec?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-id3.spec?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-idn.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
