From 2218798482ca39c791c502303ff4626650184f83 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 14 Apr 2014 16:09:35 +0200
Subject: php-pecl-imagick: rebuild
---
php-pecl-imagick-dev.spec | 11 +++++++----
php-pecl-imagick.spec | 22 ++++++++++++++++------
2 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/php-pecl-imagick-dev.spec b/php-pecl-imagick-dev.spec
index ee74feb..6a37be6 100644
--- a/php-pecl-imagick-dev.spec
+++ b/php-pecl-imagick-dev.spec
@@ -27,7 +27,7 @@
Summary: Extension to create and modify images using ImageMagick
Name: %{?scl_prefix}php-pecl-imagick
Version: 3.2.0
-Release: 0.5.RC1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 0.6.RC1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/imagick
@@ -38,11 +38,11 @@ BuildRequires: %{?scl_prefix}php-devel
BuildRequires: %{?scl_prefix}php-pear
BuildRequires: pcre-devel
%if "%{?vendor}" == "Remi Collet"
-%if 0%{?fedora} >= 20
-BuildRequires: ImageMagick-devel >= 6.7.5
+%if 0%{?fedora} > 20
+BuildRequires: ImageMagick-devel >= 6.8.9
Requires: ImageMagick-libs%{?_isa} >= %{imbuildver}
%else
-BuildRequires: ImageMagick-last-devel >= 6.7.5
+BuildRequires: ImageMagick-last-devel >= 6.8.9
Requires: ImageMagick-last-libs%{?_isa} >= %{imbuildver}
%endif
%else
@@ -260,6 +260,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Apr 14 2014 Remi Collet <remi@fedoraproject.org> - 3.2.0-0.6.RC1
+- rebuild for ImageMagick
+
* Wed Apr 9 2014 Remi Collet <remi@fedoraproject.org> - 3.2.0-0.5.RC1
- add numerical prefix to extension configuration file
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index d7a808e..e827eb5 100644
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -9,7 +9,7 @@
Summary: Extension to create and modify images using ImageMagick
Name: php-pecl-imagick
Version: 3.1.2
-Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/imagick
@@ -17,13 +17,17 @@ Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: php-devel >= 5.1.3, php-pear
-%if 0%{?fedora} >= 20
-BuildRequires: ImageMagick-devel >= 6.7.5
+%if "%{?vendor}" == "Remi Collet"
+%if 0%{?fedora} > 20
+BuildRequires: ImageMagick-devel >= 6.8.9
Requires: ImageMagick-libs%{?_isa} >= %{imbuildver}
%else
-BuildRequires: ImageMagick-last-devel >= 6.7.5
+BuildRequires: ImageMagick-last-devel >= 6.8.9
Requires: ImageMagick-last-libs%{?_isa} >= %{imbuildver}
%endif
+%else
+BuildRequires: ImageMagick-devel >= 6.2.4
+%endif
Requires(post): %{__pecl}
Requires(postun): %{__pecl}
@@ -36,18 +40,21 @@ Provides: php-pecl(%{pecl_name}) = %{version}%{?prever}
Provides: php-pecl(%{pecl_name})%{?_isa} = %{version}%{?prever}
Conflicts: php-pecl-gmagick
+%if "%{?vendor}" == "Remi Collet"
# Other third party repo stuff
Obsoletes: php53-pecl-imagick
Obsoletes: php53u-pecl-imagick
Obsoletes: php54-pecl-imagick
%if "%{php_version}" > "5.5"
-Obsoletes: php55-pecl-imagick
+Obsoletes: php55u-pecl-imagick
+%endif
%endif
+%if 0%{?fedora} < 20 && 0%{?rhel} < 7
# Filter private shared
%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
%{?filter_setup}
-
+%endif
%description
Imagick is a native php extension to create and modify images
@@ -208,6 +215,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Apr 14 2014 Remi Collet <remi@fedoraproject.org> - 3.1.2-3
+- rebuild for ImageMagick
+
* Sat Nov 2 2013 Remi Collet <rpms@famillecollet.com> - 3.1.2-2
- rebuild against new ImageMagick-last version 6.8.7-4
- install doc in pecl doc_dir
--
cgit