SPECS: mapserver.spec, php-annodex.spec, php-eaccelerator.spec, ph...
glen
glen at pld-linux.org
Tue Jan 16 23:07:17 CET 2007
Author: glen Date: Tue Jan 16 22:07:17 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use new php extension macros
---- Files affected:
SPECS:
mapserver.spec (1.29 -> 1.30) , php-annodex.spec (1.1 -> 1.2) , php-eaccelerator.spec (1.46 -> 1.47) , php-htscanner.spec (1.5 -> 1.6) , php-mmcache.spec (1.40 -> 1.41) , php-pam_auth.spec (1.4 -> 1.5) , php-pecl-dio.spec (1.7 -> 1.8) , php-pecl-geoip.spec (1.4 -> 1.5) , php-pecl-operator.spec (1.3 -> 1.4) , php-pecl-radius.spec (1.23 -> 1.24) , php-pecl-timezonedb.spec (1.6 -> 1.7) , php-pxv.spec (1.13 -> 1.14) , php-sqlite3.spec (1.4 -> 1.5) , php-xcache.spec (1.5 -> 1.6) , php-xerces.spec (1.11 -> 1.12)
---- Diffs:
================================================================
Index: SPECS/mapserver.spec
diff -u SPECS/mapserver.spec:1.29 SPECS/mapserver.spec:1.30
--- SPECS/mapserver.spec:1.29 Tue Jan 2 09:08:58 2007
+++ SPECS/mapserver.spec Tue Jan 16 23:07:11 2007
@@ -38,7 +38,7 @@
BuildRequires: php-devel >= 3:4.2.3
BuildRequires: proj-devel >= 4
BuildRequires: rpm-perlprov
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
%{?with_ms_tcl:BuildRequires: tcl-devel}
BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -96,6 +96,7 @@
Summary(pl): Moduł MapScript dla PHP
Group: Libraries
%{?requires_php_extension}
+Requires: php-common >= 4:5.0.4
%description -n php-mapscript
MapScript extension module for PHP.
@@ -122,7 +123,7 @@
%{__autoconf}
%configure \
--with-eppl \
- --with-php=/usr/include/php \
+ --with-php=$(php-config --include-dir) \
--with-proj \
--with-geos \
--with-gdal \
@@ -158,7 +159,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/php,%{_sysconfdir}/php/conf.d,%{_includedir}/mapserver}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/php,%{php_sysconfdir}/conf.d,%{_includedir}/mapserver}
install legend mapserv scalebar tile4ms \
shp2img shp2pdf shptree shptreetst sortshp \
@@ -166,8 +167,8 @@
install libmap.a $RPM_BUILD_ROOT%{_libdir}
install map.h $RPM_BUILD_ROOT%{_includedir}/mapserver
-install mapscript/php3/php_mapscript.so $RPM_BUILD_ROOT%{_libdir}/php
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/php/conf.d/mapscript.ini
+install mapscript/php3/php_mapscript.so $RPM_BUILD_ROOT%{php_extensiondir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/mapscript.ini
; Enable mapscript extension module
extension=php_mapscript.so
EOF
@@ -184,13 +185,11 @@
rm -rf $RPM_BUILD_ROOT
%post -n php-mapscript
-[ ! -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 -n php-mapscript
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
%triggerpostun -n php-mapscript -- php-mapscript < 4.6.1-1.1
@@ -217,8 +216,8 @@
%files -n php-mapscript
%defattr(644,root,root,755)
%doc mapscript/php3/README mapscript/php3/examples/*.phtml
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php/conf.d/mapscript.ini
-%attr(755,root,root) %{_libdir}/php/php_mapscript.so
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/mapscript.ini
+%attr(755,root,root) %{php_extensiondir}/php/php_mapscript.so
%if %{with ms_tcl}
%files -n tcl-mapscript
@@ -236,6 +235,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.30 2007/01/16 22:07:11 glen
+- use new php extension macros
+
Revision 1.29 2007/01/02 08:08:58 bszx
- updated to 4.10.0
================================================================
Index: SPECS/php-annodex.spec
diff -u SPECS/php-annodex.spec:1.1 SPECS/php-annodex.spec:1.2
--- SPECS/php-annodex.spec:1.1 Sat Nov 18 02:50:53 2006
+++ SPECS/php-annodex.spec Tue Jan 16 23:07:11 2007
@@ -1,7 +1,4 @@
# $Revision$, $Date$
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir 2>/dev/null)
-
Summary: phpannodex - object oriented PHP wrappings for libannodex
Summary(pl): phpannodex - obiektowo zorientowany interfejs PHP dla libannodex
Name: php-annodex
@@ -16,9 +13,9 @@
BuildRequires: libannodex-devel
BuildRequires: php-devel >= 3:5.0.0
BuildRequires: pkgconfig
-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
@@ -53,38 +50,36 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
+install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
%{__make} -C src install \
INSTALL_ROOT=$RPM_BUILD_ROOT \
- EXTENSION_DIR=%{extensionsdir}
+ EXTENSION_DIR=%{php_extensiondir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/phpannodex.ini
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/phpannodex.ini
; Enable phpannodex extension module
extension=phpannodex.so
EOF
install -d $RPM_BUILD_ROOT%{_datadir}/php
-cp -r phpannodex $RPM_BUILD_ROOT%{_datadir}/php
+cp -a phpannodex $RPM_BUILD_ROOT%{_datadir}/php
%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
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/phpannodex.ini
-%attr(755,root,root) %{extensionsdir}/phpannodex.so
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/phpannodex.ini
+%attr(755,root,root) %{php_extensiondir}/phpannodex.so
%{_datadir}/php/phpannodex
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -93,5 +88,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2007/01/16 22:07:11 glen
+- use new php extension macros
+
Revision 1.1 2006/11/18 01:50:53 qboosh
- new
================================================================
Index: SPECS/php-eaccelerator.spec
diff -u SPECS/php-eaccelerator.spec:1.46 SPECS/php-eaccelerator.spec:1.47
--- SPECS/php-eaccelerator.spec:1.46 Wed Dec 20 10:35:32 2006
+++ SPECS/php-eaccelerator.spec Tue Jan 16 23:07:11 2007
@@ -4,9 +4,6 @@
#
%define _name eaccelerator
%define _pkgname eaccelerator
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir 2>/dev/null)
-#
Summary: eAccelerator module for PHP
Summary(pl): Moduł eAccelerator dla PHP
Name: php-%{_name}
@@ -21,10 +18,10 @@
Patch0: %{name}-php5.2.patch
URL: http://eaccelerator.net/
BuildRequires: php-devel >= 3:5.0.0
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
%requires_eq php-common
%{?requires_php_extension}
-Requires: %{_sysconfdir}/conf.d
+Requires: php-common >= 4:5.0.4
Requires: php(zlib)
Conflicts: php-mmcache
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -81,11 +78,11 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{extensionsdir},%{_bindir},%{_sysconfdir}/conf.d,/var/cache/%{_name},/etc/tmpwatch}
+install -d $RPM_BUILD_ROOT{%{php_extensiondir},%{_bindir},%{php_sysconfdir}/conf.d,/var/cache/%{_name},/etc/tmpwatch}
-install ./modules/eaccelerator.so $RPM_BUILD_ROOT%{extensionsdir}
+install ./modules/eaccelerator.so $RPM_BUILD_ROOT%{php_extensiondir}
install ./encoder.php $RPM_BUILD_ROOT%{_bindir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_name}.ini
+install %{SOURCE1} $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_name}.ini
install -d $RPM_BUILD_ROOT/home/services/httpd/html/eaccelerator
cp -a doc/php/* $RPM_BUILD_ROOT/home/services/httpd/html/eaccelerator
@@ -96,13 +93,11 @@
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
%preun
@@ -114,9 +109,9 @@
%files
%defattr(644,root,root,755)
%doc README
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_name}.ini
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{_name}.ini
%config(noreplace) %verify(not md5 mtime size) /etc/tmpwatch/%{name}.conf
-%attr(755,root,root) %{extensionsdir}/eaccelerator.so
+%attr(755,root,root) %{php_extensiondir}/eaccelerator.so
%attr(755,root,root) %{_bindir}/encoder.php
%attr(770,root,http) /var/cache/%{_name}
@@ -130,6 +125,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47 2007/01/16 22:07:11 glen
+- use new php extension macros
+
Revision 1.46 2006/12/20 09:35:32 arekm
rel 5; php 5.2 fixes
================================================================
Index: SPECS/php-htscanner.spec
diff -u SPECS/php-htscanner.spec:1.5 SPECS/php-htscanner.spec:1.6
--- SPECS/php-htscanner.spec:1.5 Fri Nov 3 00:09:09 2006
+++ SPECS/php-htscanner.spec Tue Jan 16 23:07:11 2007
@@ -1,7 +1,5 @@
# $Revision$, $Date$
%define _modname htscanner
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir 2>/dev/null)
Summary: PHP Module to emulate .htaccess support in PHP engine
Summary(pl): Moduł PHP do emulacji obsługi .htaccess w silniku PHP
Name: php-htscanner
@@ -14,9 +12,9 @@
Patch0: %{name}-zts.patch
URL: http://trac.lighttpd.net/trac/wiki/HowToPhpHtaccess
BuildRequires: php-devel >= 3:5.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
@@ -56,8 +54,8 @@
%{__make} install \
INSTALL_ROOT=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
; Enable %{_modname} extension module
extension=%{_modname}.so
@@ -69,20 +67,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 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
@@ -90,6 +86,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2007/01/16 22:07:11 glen
+- use new php extension macros
+
Revision 1.5 2006/11/02 23:09:09 glen
- BR rpmmacros for fixed %requires_php_extension
================================================================
Index: SPECS/php-mmcache.spec
diff -u SPECS/php-mmcache.spec:1.40 SPECS/php-mmcache.spec:1.41
--- SPECS/php-mmcache.spec:1.40 Sun Nov 26 17:02:52 2006
+++ SPECS/php-mmcache.spec Tue Jan 16 23:07:11 2007
@@ -1,9 +1,6 @@
# $Revision$, $Date$
%define _modname mmcache
%define _pkgname turck-mmcache
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir 2>/dev/null)
-
Summary: Turck MMCache extension module for PHP
Summary(pl): Moduł Turck MMCache dla PHP
Name: php-%{_modname}
@@ -16,11 +13,11 @@
# Source0-md5: bcf671bec2e8b009e9b2d8f8d2574041
URL: http://turck-mmcache.sourceforge.net
BuildRequires: php-devel >= 3:5.0.0
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
%{?requires_php_extension}
%{?requires_zend_extension}
Requires(triggerpostun): sed >= 4.0
-Requires: %{_sysconfdir}/conf.d
+Requires: php-common >= 4:5.0.4
Requires: php(zlib)
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -100,20 +97,20 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir},%{_bindir}}
+install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir},%{_bindir}}
-install ./modules/mmcache.so $RPM_BUILD_ROOT%{extensionsdir}
+install ./modules/mmcache.so $RPM_BUILD_ROOT%{php_extensiondir}
install ./encoder.php $RPM_BUILD_ROOT%{_bindir}
install ./mmcache_password.php $RPM_BUILD_ROOT%{_bindir}
install ./mmcache.php $RPM_BUILD_ROOT%{_bindir}
-install ./TurckLoader/modules/TurckLoader.so $RPM_BUILD_ROOT%{extensionsdir}
+install ./TurckLoader/modules/TurckLoader.so $RPM_BUILD_ROOT%{php_extensiondir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
; Enable %{_modname} extension module
extension=%{_modname}.so
EOF
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/TurckLoader.ini
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/TurckLoader.ini
; Enable TurckLoader
extension=TurckLoader.so
EOF
@@ -122,43 +119,39 @@
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
%post TurckLoader
-[ ! -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 TurckLoader
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
%triggerpostun -- %{name} <= 2.4.6-5
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mmcache\.so/d' %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mmcache\.so/d' %{php_sysconfdir}/php.ini
%triggerpostun TurckLoader -- %{name}-TurckLoader <= 2.4.6-5
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*TurckLoader\.so/d' %{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*TurckLoader\.so/d' %{php_sysconfdir}/php.ini
%files
%defattr(644,root,root,755)
%doc CREDITS EXPERIMENTAL README TODO
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/%{_modname}.ini
-%attr(755,root,root) %{extensionsdir}/mmcache.so
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/%{_modname}.ini
+%attr(755,root,root) %{php_extensiondir}/mmcache.so
%attr(755,root,root) %{_bindir}/encoder.php
%files TurckLoader
%defattr(644,root,root,755)
%doc CREDITS EXPERIMENTAL README.loader
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/TurckLoader.ini
-%attr(755,root,root) %{extensionsdir}/TurckLoader.so
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/TurckLoader.ini
+%attr(755,root,root) %{php_extensiondir}/TurckLoader.so
%files webinterface
%defattr(644,root,root,755)
@@ -171,6 +164,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.41 2007/01/16 22:07:11 glen
+- use new php extension macros
+
Revision 1.40 2006/11/26 16:02:52 glen
- php virtual extension deps
================================================================
Index: SPECS/php-pam_auth.spec
diff -u SPECS/php-pam_auth.spec:1.4 SPECS/php-pam_auth.spec:1.5
--- SPECS/php-pam_auth.spec:1.4 Fri Nov 3 00:09:09 2006
+++ SPECS/php-pam_auth.spec Tue Jan 16 23:07:11 2007
@@ -1,8 +1,5 @@
# $Revision$, $Date$
%define _modname pam_auth
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir 2>/dev/null)
-
Summary: %{_modname} - authenticate someone using PAM
Summary(pl): %{_modname} - uwierzytelnianie przy użyciu PAM
Name: php-%{_modname}
@@ -14,9 +11,9 @@
# Source0-md5: cc757d76194b1b5d41bfa74cfe6275df
URL: http://www.math.ohio-state.edu/~ccunning/pam_auth/
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
@@ -42,13 +39,13 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
+install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
%{__make} install \
-C %{_modname} \
INSTALL_ROOT=$RPM_BUILD_ROOT \
- EXTENSION_DIR=%{extensionsdir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+ EXTENSION_DIR=%{php_extensiondir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
; Enable %{_modname} extension module
extension=%{_modname}.so
EOF
@@ -69,8 +66,8 @@
%files
%defattr(644,root,root,755)
%doc %{_modname}/{FAQ,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
@@ -78,6 +75,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2007/01/16 22:07:11 glen
+- use new php extension macros
+
Revision 1.4 2006/11/02 23:09:09 glen
- BR rpmmacros for fixed %requires_php_extension
================================================================
Index: SPECS/php-pecl-dio.spec
diff -u SPECS/php-pecl-dio.spec:1.7 SPECS/php-pecl-dio.spec:1.8
--- SPECS/php-pecl-dio.spec:1.7 Fri Nov 3 00:09:09 2006
+++ SPECS/php-pecl-dio.spec Tue Jan 16 23:07:11 2007
@@ -1,13 +1,11 @@
# $Revision$, $Date$
%define _modname dio
%define _status beta
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir 2>/dev/null)
+%define _rc rc1
Summary: %{_modname} - Direct I/O functions
Summary(pl): %{_modname} - funkcje bezpośredniego we/wy
Name: php-pecl-%{_modname}
Version: 5.0
-%define _rc rc1
Release: 0.%{_rc}.1
License: PHP 2.02
Group: Development/Languages/PHP
@@ -16,10 +14,10 @@
# Source0-md5: b926091229d356253f9f30f99e1e2253
URL: http://pecl.php.net/package/dio/
BuildRequires: php-devel >= 3:5.0.0
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
%{?requires_php_extension}
+Requires: php-common >= 4:5.0.4
Obsoletes: php-dio
-Requires: %{_sysconfdir}/conf.d
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -53,12 +51,12 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
+install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
%{__make} install \
INSTALL_ROOT=$RPM_BUILD_ROOT \
- EXTENSION_DIR=%{extensionsdir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+ EXTENSION_DIR=%{php_extensiondir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
; Enable %{_modname} extension module
extension=%{_modname}.so
EOF
@@ -67,19 +65,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
@@ -87,6 +83,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2007/01/16 22:07:11 glen
+- use new php extension macros
+
Revision 1.7 2006/11/02 23:09:09 glen
- BR rpmmacros for fixed %requires_php_extension
================================================================
Index: SPECS/php-pecl-geoip.spec
diff -u SPECS/php-pecl-geoip.spec:1.4 SPECS/php-pecl-geoip.spec:1.5
--- SPECS/php-pecl-geoip.spec:1.4 Fri Nov 3 00:09:09 2006
+++ SPECS/php-pecl-geoip.spec Tue Jan 16 23:07:11 2007
@@ -1,9 +1,6 @@
# $Revision$, $Date$
%define _modname geoip
%define _status beta
-%define _sysconfdir /etc/php
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mapserver.spec?r1=1.29&r2=1.30&f=u
http://cvs.pld-linux.org/SPECS/php-annodex.spec?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SPECS/php-eaccelerator.spec?r1=1.46&r2=1.47&f=u
http://cvs.pld-linux.org/SPECS/php-htscanner.spec?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/SPECS/php-mmcache.spec?r1=1.40&r2=1.41&f=u
http://cvs.pld-linux.org/SPECS/php-pam_auth.spec?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-dio.spec?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-geoip.spec?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-operator.spec?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-radius.spec?r1=1.23&r2=1.24&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-timezonedb.spec?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/SPECS/php-pxv.spec?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/SPECS/php-sqlite3.spec?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SPECS/php-xcache.spec?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/SPECS/php-xerces.spec?r1=1.11&r2=1.12&f=u
More information about the pld-cvs-commit
mailing list