[ImageMagick/f20] - Build 6.8.6-3 version because soname bump happened in newer. - Concretize soname versioning. - Add
Pavel Alexeev
hubbitus at fedoraproject.org
Tue Apr 8 07:21:02 UTC 2014
commit 001f14d9014df7fd0e52f6eb1f6facd7ae819740
Author: Hubbitus <pahan at hubbitus.info>
Date: Tue Apr 8 11:20:40 2014 +0400
- Build 6.8.6-3 version because soname bump happened in newer.
- Concretize soname versioning.
- Add Patch0: ImageMagick-6.8.7-psd-CVE.patch CVE bug fix backporting:
http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25128&sid=ff40ad66b1f845c767aa77c7e32f9f9c&p=109901#p109901
for fix CVE-2014-1958 (bz#1067276, bz#1067277, bz#1067278), CVE-2014-1947, CVE-2014-2030 (bz#1064098)
- Enable %%check by Alexander Todorov suggestion - bz#1076671.
- Add %%{?_smp_mflags} into make install and check (not main compilation).
- Porting some other non-destructive minor enhancments from master branch:
o Drop BR giflib-devel (bz#1039378)
o Use %%__isa_bits instead of hardcoding the list of 64-bit architectures.
ImageMagick.spec | 35 ++++++++++-------------------------
sources | 2 +-
2 files changed, 11 insertions(+), 26 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index f403ec9..ac0e3df 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,9 +1,9 @@
-%global VER 6.8.7
-%global Patchlevel 0
+%global VER 6.8.6
+%global Patchlevel 3
Name: ImageMagick
Version: %{VER}.%{Patchlevel}
-Release: 5%{?dist}
+Release: 4%{?dist}
Summary: An X application for displaying and manipulating images
Group: Applications/Multimedia
License: ImageMagick
@@ -17,7 +17,7 @@ Patch0: ImageMagick-6.8.7-psd-CVE.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, perl-devel >= 5.8.1
+BuildRequires: libtiff-devel, zlib-devel, perl-devel >= 5.8.1
BuildRequires: ghostscript-devel, djvulibre-devel
BuildRequires: libwmf-devel, jasper-devel, libtool-ltdl-devel
BuildRequires: libX11-devel, libXext-devel, libXt-devel
@@ -303,7 +303,7 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%doc Magick++/AUTHORS Magick++/ChangeLog Magick++/NEWS Magick++/README
%doc www/Magick++/COPYING
-%{_libdir}/libMagick++-6.Q16.so.3*
+%{_libdir}/libMagick++-6.Q16.so.1*
%files c++-devel
%defattr(-,root,root,-)
@@ -324,32 +324,17 @@ rm -rf %{buildroot}
%doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
%changelog
-* Thu Apr 3 2014 Pavel Alexeev <Pahan at Hubbitus.info> - 6.8.7.0-5
-- Build 6.8.7-0 version because soname bump happened in newer.
+* Thu Apr 3 2014 Pavel Alexeev <Pahan at Hubbitus.info> - 6.8.6.3-4
+- Build 6.8.6-3 version because soname bump happened in newer.
- Concretize soname versioning.
- Add Patch0: ImageMagick-6.8.7-psd-CVE.patch CVE bug fix backporting:
http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25128&sid=ff40ad66b1f845c767aa77c7e32f9f9c&p=109901#p109901
for fix CVE-2014-1958 (bz#1067276, bz#1067277, bz#1067278), CVE-2014-1947, CVE-2014-2030 (bz#1064098)
- Enable %%check by Alexander Todorov suggestion - bz#1076671.
- Add %%{?_smp_mflags} into make install and check (not main compilation).
-
-* Mon Jan 6 2014 Pavel Alexeev <Pahan at Hubbitus.info> - 6.8.7.0-4
-- Drop BR giflib-devel (bz#1039378)
-
-* Thu Jan 02 2014 Orion Poplawski <orion at cora.nwra.com> - 6.8.7.0-3
-- Rebuild for libwebp soname bump
-
-* Wed Nov 27 2013 Rex Dieter <rdieter at fedoraproject.org> 6.8.7.0-2
-- rebuild (openexr)
-
-* Fri Nov 08 2013 Kyle McMartin <kyle at fedoraproject.org>
-- Use %__isa_bits instead of hardcoding the list of 64-bit architectures.
-
-* Mon Oct 7 2013 Pavel Alexeev <Pahan at Hubbitus.info> - 6.8.7.0-1
-- Update to 6.8.7-0 to fix badurl (http://www.mail-archive.com/devel@lists.fedoraproject.org/msg67796.html)
-
-* Sun Sep 08 2013 Rex Dieter <rdieter at fedoraproject.org> - 6.8.6.3-4
-- rebuild (openexr)
+- Porting some other non-destructive minor enhancments from master branch:
+ o Drop BR giflib-devel (bz#1039378)
+ o Use %%__isa_bits instead of hardcoding the list of 64-bit architectures.
* Fri Aug 02 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.8.6.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 8a1b5fc..2ec5cf8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65dad501b11f295f0283efca7dae5b2d ImageMagick-6.8.7-0.tar.xz
+84f1a14906b58c8d8ce1ed35cb882112 ImageMagick-6.8.6-3.tar.xz
More information about the scm-commits
mailing list