- release 2 (by relup.sh)

[packages/GraphicsMagick.git] / GraphicsMagick.spec

diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index 78cb0557752feefc2e5815bf8f4ee79f62df93a2..86fc486b54da686c1c8e8bd07dd48e63de1bdda6 100644 (file)
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -3,7 +3,8 @@
 %bcond_without fpx             # without FlashPIX module (which uses fpx library)
 %bcond_with    gs              # with PostScript support through ghostscript library (warning: breaks jpeg!)
 %bcond_without jasper          # without JPEG2000 module (which uses jasper library)
-%bcond_without cxx             # without Magick++
+%bcond_without cxx             # without Magick++ library
+%bcond_without gomp            # OpenMP support
 #
 %include       /usr/lib/rpm/macros.perl
 %define                QuantumDepth    16
@@ -19,26 +20,27 @@ Summary(ru.UTF-8):  Просмотр, конвертирование, обраб
 Summary(tr.UTF-8):     X altında resim gösterme, çevirme ve değişiklik yapma
 Summary(uk.UTF-8):     Перегляд, конвертування та обробка зображень під X Window
 Name:          GraphicsMagick
-Version:       1.3.6
-Release:       1
+Version:       1.3.18
+Release:       2
 License:       MIT
 Group:         X11/Applications/Graphics
-Source0:       http://dl.sourceforge.net/graphicsmagick/%{name}-%{version}.tar.lzma
-# Source0-md5: b602509eecd926c157047407ea3fb4ad
-Patch0:                %{name}-libpath.patch
-Patch1:                %{name}-link.patch
-Patch2:                %{name}-ldflags.patch
+Source0:       http://downloads.sourceforge.net/graphicsmagick/%{name}-%{version}.tar.xz
+# Source0-md5: 45e16e0e9628c167390de837d2144042
+Patch0:                %{name}-link.patch
+Patch1:                %{name}-ldflags.patch
 URL:           http://www.graphicsmagick.org/
-BuildRequires: autoconf >= 2.62
+BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.10.1
 BuildRequires: bzip2-devel >= 1.0.1
 BuildRequires: expat-devel >= 1.95.7
 BuildRequires: freetype-devel >= 2.0.2-2
+%{?with_gomp:BuildRequires:    gcc >= 6:4.2}
 %{?with_gs:BuildRequires:      ghostscript-devel}
 %{?with_jasper:BuildRequires:  jasper-devel >= 1.900.1}
 BuildRequires: jbigkit-devel >= 1.6
-BuildRequires: lcms-devel >= 1.16
+BuildRequires: lcms2-devel >= 2
 %{?with_fpx:BuildRequires:     libfpx-devel >= 1.2.0.4-3}
+%{?with_gomp:BuildRequires:    libgomp-devel}
 BuildRequires: libjpeg-devel
 BuildRequires: libltdl-devel
 BuildRequires: libpng-devel >= 1.2.18
@@ -51,6 +53,7 @@ BuildRequires:        perl-devel >= 1:5.8.0
 BuildRequires: rpm-perlprov >= 4.1-13
 BuildRequires: rpmbuild(macros) >= 1.315
 BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xz-devel
 # only checked for, but only supplied scripts/txt2html is used
 #BuildRequires:        txt2html
 Requires:      %{name}-libs = %{version}-%{release}
@@ -138,9 +141,10 @@ Group:             X11/Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      bzip2-devel
 Requires:      freetype-devel
-Requires:      lcms-devel
+Requires:      lcms2-devel >= 2
 Requires:      libltdl-devel
 Requires:      xorg-lib-libXext-devel
+Requires:      xz-devel
 Requires:      zlib-devel
 
 %description devel
@@ -540,11 +544,9 @@ Documentation for GraphicsMagick.
 Dokumentacja do GraphicsMagick.
 
 %prep
-%setup -q -c -T
-lzma -dc %{SOURCE0} | tar xf - -C ..
+%setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 find PerlMagick scripts www -type f -exec perl -pi -e 's=!%{_prefix}/local/bin/perl=!%{__perl}=' {} \;
 
@@ -556,6 +558,7 @@ find PerlMagick scripts www -type f -exec perl -pi -e 's=!%{_prefix}/local/bin/p
 %configure \
        --enable-fast-install \
        --enable-shared \
+       %{!?with_gomp:--disable-openmp} \
        --disable-ltdl-install \
        --without-dps \
        --with%{!?with_fpx:out}-fpx \
@@ -582,9 +585,6 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
        pkgdocdir=%{_docdir}/%{name}-devel-%{version}
 
 install PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
-rm -f $RPM_BUILD_ROOT%{modulesdir}/{coders,filters}/*.a
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/Copyright.txt
-rm -f $RPM_BUILD_ROOT%{modulesdir}/coders/dps.*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -661,12 +661,18 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/icon.la
 %attr(755,root,root) %{modulesdir}/coders/identity.so
 %{modulesdir}/coders/identity.la
+%attr(755,root,root) %{modulesdir}/coders/info.so
+%{modulesdir}/coders/info.la
+%attr(755,root,root) %{modulesdir}/coders/jnx.so
+%{modulesdir}/coders/jnx.la
 %attr(755,root,root) %{modulesdir}/coders/label.so
 %{modulesdir}/coders/label.la
 %attr(755,root,root) %{modulesdir}/coders/locale.so
 %{modulesdir}/coders/locale.la
 %attr(755,root,root) %{modulesdir}/coders/logo.so
 %{modulesdir}/coders/logo.la
+%attr(755,root,root) %{modulesdir}/coders/mac.so
+%{modulesdir}/coders/mac.la
 %attr(755,root,root) %{modulesdir}/coders/map.so
 %{modulesdir}/coders/map.la
 %attr(755,root,root) %{modulesdir}/coders/mat.so