Author: glen Date: Tue Jan 2 19:45:14 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use new php extension related macros
---- Files affected:
SPECS:
php-pecl-imagick.spec (1.33 -> 1.34)
---- Diffs:
================================================================
Index: SPECS/php-pecl-imagick.spec
diff -u SPECS/php-pecl-imagick.spec:1.33 SPECS/php-pecl-imagick.spec:1.34
--- SPECS/php-pecl-imagick.spec:1.33 Wed Dec 13 23:37:44 2006
+++ SPECS/php-pecl-imagick.spec Tue Jan 2 20:45:09 2007
@@ -1,8 +1,6 @@
# $Revision$, $Date$
%define _modname imagick
%define _status beta
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: PHP wrapper to the Image Magick Library
Summary(pl): PHP-owy wrapper do biblioteki Image Magick
Name: php-pecl-%{_modname}
@@ -15,10 +13,10 @@
URL: http://pecl.php.net/package/imagick/
BuildRequires: ImageMagick-devel >= 1:6.2.4.0
BuildRequires: php-devel >= 3:5.0.0
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
%{?requires_php_extension}
Requires(triggerpostun): sed >= 4.0
-Requires: %{_sysconfdir}/conf.d
+Requires: php-common >= 4:5.0.4
Provides: php(imagick)
Obsoletes: php-imagick
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -57,10 +55,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 %{_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
@@ -69,23 +67,21 @@
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
%triggerpostun -- %{name} < 0.9.11-2.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*%{_modname}\.so/d'
%{_sysconfdir}/php.ini
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*%{_modname}\.so/d'
%{php_sysconfdir}/php.ini
%files
%defattr(644,root,root,755)
%doc %{_modname}-%{version}/examples/{*.php,*.jpg,*.gif}
-%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
@@ -93,6 +89,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.34 2007/01/02 19:45:09 glen
+- use new php extension related macros
+
Revision 1.33 2006/12/13 22:37:44 glen
- rel 12 (php 5.2.0)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php-pecl-imagick.spec?r1=1.33&r2=1.34&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
