Author: glen Date: Fri Dec 29 15:51:57 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use new php extension related macros
---- Files affected:
SPECS:
php4-pecl-fileinfo.spec (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SPECS/php4-pecl-fileinfo.spec
diff -u SPECS/php4-pecl-fileinfo.spec:1.5 SPECS/php4-pecl-fileinfo.spec:1.6
--- SPECS/php4-pecl-fileinfo.spec:1.5 Fri Dec 29 16:49:17 2006
+++ SPECS/php4-pecl-fileinfo.spec Fri Dec 29 16:51:49 2006
@@ -2,8 +2,6 @@
%define _modname fileinfo
%define _smodname Fileinfo
%define _status beta
-%define _sysconfdir /etc/php4
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - libmagic bindings
Summary(pl): %{_modname} - dowiązania biblioteki libmagic
Name: php4-pecl-%{_modname}
@@ -16,9 +14,9 @@
Patch0: pecl-fileinfo-defaultdb.patch
URL: http://pecl.php.net/package/Fileinfo/
BuildRequires: php4-devel >= 3:4.3.0
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
%{?requires_php_extension}
-Requires: %{_sysconfdir}/conf.d
+Requires: php4-common >= 3:4.4.0-3
Obsoletes: php-pear-%{_modname}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -54,9 +52,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
@@ -65,20 +64,18 @@
rm -rf $RPM_BUILD_ROOT
%post
-[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
+%php4_webserver_restart
%postun
if [ "$1" = 0 ]; then
- [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache
restart
- [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd
restart
+ %php4_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 +83,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2006/12/29 15:51:49 glen
+- use new php extension related macros
+
Revision 1.5 2006/12/29 15:49:17 glen
- do not set magic db, use system defaults; rel 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php4-pecl-fileinfo.spec?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
