- conf.d and php api macros

Changed files:
    php-pecl-imagick.spec -> 1.22

diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index 6d81930368593f0cde2534c51f64ece6aae1f710..29fbabec21dc75f3b4b283dda9857d0586634029 100644 (file)
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -1,24 +1,26 @@
 %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}
 Version:       0.9.11
-Release:       2
+Release:       3
 License:       PHP 2.02
 Group:         Development/Languages/PHP
 Source0:       http://pecl.php.net/get/%{_modname}-%{version}.tgz
 # Source0-md5: c8f78b063eb3fbdef1c8501190983c89
 URL:           http://pecl.php.net/package/imagick/
 BuildRequires: ImageMagick-devel >= 1:6.0.0
-BuildRequires: php-devel
-Requires:      php-common
+BuildRequires: php-devel >= 3:5.0.0
+BuildRequires: rpmbuild(macros) >= 1.238
+%{?requires_php_extension}
+Requires:      %{_sysconfdir}/conf.d
 Obsoletes:     php-imagick
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc/php
-%define                extensionsdir   %{_libdir}/php
-
 %description
 ImageMagick is a robust collection of tools and libraries to read,
 write, and manipulate an image in many image formats (over 68 major
@@ -53,22 +55,32 @@ phpize
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{extensionsdir}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
 
 install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{extensionsdir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+; Enable %{_modname} extension module
+extension=%{_modname}.so
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_sbindir}/php-module-install install %{_modname} %{_sysconfdir}/php.ini
+[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
+[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
 
-%preun
-if [ "$1" = "0" ]; then
-       %{_sbindir}/php-module-install remove %{_modname} %{_sysconfdir}/php.ini
+%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
 fi
 
+%triggerpostun -- %{name} < 0.9.11-2.1
+%{_sbindir}/php-module-install remove %{_modname} %{_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