SPECS: php-wbxml.spec - new php extension macros

[glen]

Author: glen                         Date: Tue Jan 16 21:43:19 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- new php extension macros

---- Files affected:
SPECS:
   php-wbxml.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/php-wbxml.spec
diff -u SPECS/php-wbxml.spec:1.6 SPECS/php-wbxml.spec:1.7
--- SPECS/php-wbxml.spec:1.6	Tue Jan 16 22:40:29 2007
+++ SPECS/php-wbxml.spec	Tue Jan 16 22:43:14 2007
@@ -1,7 +1,5 @@
 # $Revision$, $Date$
 %define		_modname	wbxml
-%define		_sysconfdir	/etc/php
-%define		extensionsdir	%(php-config --extension-dir 2>/dev/null)
 Summary:	PHP WBXML Library wrapper
 Summary(pl):	Wrapper PHP do biblioteki WBXML
 Name:		php-wbxml
@@ -15,10 +13,10 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	php-devel >= 3:5.0.0
-BuildRequires:	rpmbuild(macros) >= 1.322
+BuildRequires:	rpmbuild(macros) >= 1.344
 BuildRequires:	wbxml2-devel
 %{?requires_php_extension}
-Requires:	%{_sysconfdir}/conf.d
+Requires:	php-common >= 4:5.0.4
 Requires:	wbxml2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -47,12 +45,12 @@
 
 %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}}
 
 %{__make} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
-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
@@ -61,20 +59,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 README 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
@@ -82,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2007/01/16 21:43:14  glen
+- new php extension macros
+
 Revision 1.6  2007/01/16 21:40:29  glen
 - fix duplicate %descriptions
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-wbxml.spec?r1=1.6&r2=1.7&f=u