summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ImageMagick-6.9.2-7-multiarch-implicit-pkgconfig-dir.patch28
-rw-r--r--ImageMagick6.spec11
2 files changed, 5 insertions, 34 deletions
diff --git a/ImageMagick-6.9.2-7-multiarch-implicit-pkgconfig-dir.patch b/ImageMagick-6.9.2-7-multiarch-implicit-pkgconfig-dir.patch
deleted file mode 100644
index 8f711cc..0000000
--- a/ImageMagick-6.9.2-7-multiarch-implicit-pkgconfig-dir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -NurEbBH ImageMagick-6.9.2-7.orig/wand/MagickWand-config.in ImageMagick-6.9.2-7/wand/MagickWand-config.in
---- ImageMagick-6.9.2-7.orig/wand/MagickWand-config.in 2015-11-26 17:14:07.000000000 +0300
-+++ ImageMagick-6.9.2-7/wand/MagickWand-config.in 2015-12-05 21:53:37.350660894 +0300
-@@ -38,19 +38,19 @@
- echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
- ;;
- --cflags)
-- PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --cflags MagickWand
-+ pkg-config --cflags MagickWand
- ;;
- --cxxflags)
-- PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --cflags MagickWand
-+ pkg-config --cflags MagickWand
- ;;
- --cppflags)
-- PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --cflags MagickWand
-+ pkg-config --cflags MagickWand
- ;;
- --ldflags)
-- PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --libs MagickWand
-+ pkg-config --libs MagickWand
- ;;
- --libs)
-- PKG_CONFIG_PATH="@libdir@/pkgconfig" pkg-config --libs MagickWand
-+ pkg-config --libs MagickWand
- ;;
- *)
- echo "${usage}" 1>&2
diff --git a/ImageMagick6.spec b/ImageMagick6.spec
index bbe769b..6854c4a 100644
--- a/ImageMagick6.spec
+++ b/ImageMagick6.spec
@@ -9,7 +9,7 @@
# Please preserve changelog entries
#
%global VER 6.9.8
-%global Patchlevel 0
+%global Patchlevel 2
%global incsuffixe -6
%global libsuffixe -6.Q16
%global with_tests 0%{!?_without_tests:1}
@@ -71,15 +71,13 @@ Name: %{libname}
Name: %{libname}6
%endif
Version: %{VER}.%{Patchlevel}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: An X application for displaying and manipulating images
Group: Applications/Multimedia
License: ImageMagick
Url: http://www.imagemagick.org/
Source0: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.xz
-Patch0: ImageMagick-6.9.2-7-multiarch-implicit-pkgconfig-dir.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
BuildRequires: libtiff-devel, giflib-devel, zlib-devel
@@ -302,8 +300,6 @@ however.
%prep
%setup -q -n %{libname}-%{VER}-%{Patchlevel}
-%patch0 -p1 -b .multiarch-implicit-pkgconfig-dir
-
# for %%doc
mkdir Magick++/examples
cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples
@@ -555,6 +551,9 @@ fi
%changelog
+* Mon Mar 20 2017 Remi Collet <remi@remirepo.net> - 6.9.8.2-1
+- update to version 6.9.8 patch level 2
+
* Thu Mar 16 2017 Remi Collet <remi@remirepo.net> - 6.9.8.0-2
- cleanup build options
- build --with-raqm when available