X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=GraphicsMagick.spec;h=4ecf644411251653828ced16ee6d4315a6d0451a;hb=9d4bd31733adb97d843c097756fb079014646f8f;hp=e62452669d85851ebfa83999fd96c9eb5c5355f5;hpb=3301315a7bcb785835f57cd006ccfafdba35843b;p=packages%2FGraphicsMagick.git

diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index e624526..4ecf644 100644
--- 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	openmp		# OpenMP support
 #
 %include	/usr/lib/rpm/macros.perl
 %define		QuantumDepth	16
@@ -19,38 +20,43 @@ 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.12
-Release:	4
+Version:	1.3.23
+Release:	1
 License:	MIT
 Group:		X11/Applications/Graphics
-Source0:	http://dl.sourceforge.net/graphicsmagick/%{name}-%{version}.tar.lzma
-# Source0-md5:	1b91c37daa9640440a91a83727607269
-Patch0:		%{name}-libpath.patch
-Patch1:		%{name}-link.patch
-Patch2:		%{name}-ldflags.patch
+Source0:	http://downloads.sourceforge.net/graphicsmagick/%{name}-%{version}.tar.xz
+# Source0-md5:	9885ff5d91bc215a0adb3be1185e9777
+Patch0:		%{name}-link.patch
+Patch1:		%{name}-ldflags.patch
 URL:		http://www.graphicsmagick.org/
-BuildRequires:	autoconf >= 2.62
-BuildRequires:	automake >= 1:1.10.1
+BuildRequires:	autoconf >= 2.69
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	bzip2-devel >= 1.0.1
 BuildRequires:	expat-devel >= 1.95.7
 BuildRequires:	freetype-devel >= 2.0.2-2
+%{?with_openmp: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.0
 %{?with_fpx:BuildRequires:	libfpx-devel >= 1.2.0.4-3}
-BuildRequires:	libjpeg-devel
-BuildRequires:	libltdl-devel
-BuildRequires:	libpng-devel >= 1.2.18
+%{?with_openmp:BuildRequires:	libgomp-devel}
+BuildRequires:	libjpeg-devel >= 6b
+BuildRequires:	libltdl-devel >= 2:2.2
+BuildRequires:	libpng-devel >= 2:1.2.18
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel >= 3.8.2
 BuildRequires:	libtool >= 2:2.2
+BuildRequires:	libwebp-devel
 BuildRequires:	libwmf-devel >= 2:0.2.2
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpmbuild(macros) >= 1.315
+BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xz-devel
+BuildRequires:	zlib-devel
 # only checked for, but only supplied scripts/txt2html is used
 #BuildRequires:	txt2html
 Requires:	%{name}-libs = %{version}-%{release}
@@ -138,9 +144,10 @@ Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	bzip2-devel
 Requires:	freetype-devel
-Requires:	lcms-devel
+Requires:	lcms2-devel >= 2.0
 Requires:	libltdl-devel
 Requires:	xorg-lib-libXext-devel
+Requires:	xz-devel
 Requires:	zlib-devel
 
 %description devel
@@ -374,6 +381,18 @@ Coder module for retrieving files via URL.
 %description coder-url -l pl.UTF-8
 Moduł kodera ściągający pliki o podanym URL.
 
+%package coder-webp
+Summary:	Coder module for WebP files
+Summary(pl.UTF-8):	Moduł kodera dla plików WebP
+Group:		X11/Applications/Graphics
+Requires:	%{name} = %{version}-%{release}
+
+%description coder-webp
+Coder module for WebP files.
+
+%description coder-webp -l pl.UTF-8
+Moduł kodera dla plików WebP.
+
 %package coder-wmf
 Summary:	Coder module for WMF files
 Summary(pl.UTF-8):	Moduł kodera dla plików WMF
@@ -540,11 +559,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,13 +573,13 @@ find PerlMagick scripts www -type f -exec perl -pi -e 's=!%{_prefix}/local/bin/p
 %configure \
 	--enable-fast-install \
 	--enable-shared \
-	--disable-ltdl-install \
+	%{!?with_openmp:--disable-openmp} \
 	--without-dps \
-	--with%{!?with_fpx:out}-fpx \
-	--with%{!?with_gs:out}-gslib \
-	--with%{!?with_jasper:out}-jp2 \
-	--with%{!?with_cxx:out}-magick_plus_plus \
+	--with-fpx%{!?with_fpx:=no} \
 	--with-gs-font-dir=%{_fontsdir}/Type1 \
+	--with-gslib%{!?with_gs:=no} \
+	--with-jp2%{!?with_jasper:=no} \
+	--with-magick_plus_plus%{!?with_cxx:=no} \
 	--with-modules \
 	--with-perl=%{__perl} \
 	--with-perl-options="INSTALLDIRS=vendor" \
@@ -612,8 +629,6 @@ rm -rf $RPM_BUILD_ROOT
 # ========= coders without additional deps
 %attr(755,root,root) %{modulesdir}/coders/art.so
 %{modulesdir}/coders/art.la
-%attr(755,root,root) %{modulesdir}/coders/avi.so
-%{modulesdir}/coders/avi.la
 %attr(755,root,root) %{modulesdir}/coders/avs.so
 %{modulesdir}/coders/avs.la
 %attr(755,root,root) %{modulesdir}/coders/bmp.so
@@ -658,12 +673,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
@@ -880,6 +901,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{modulesdir}/coders/url.so
 %{modulesdir}/coders/url.la
 
+%files coder-webp
+%defattr(644,root,root,755)
+# R: libwebp
+%attr(755,root,root) %{modulesdir}/coders/webp.so
+%{modulesdir}/coders/webp.la
+
 %files coder-wmf
 %defattr(644,root,root,755)
 # R: libwmf, expat, libjpeg, libpng
@@ -890,7 +917,7 @@ rm -rf $RPM_BUILD_ROOT
 %files c++
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libGraphicsMagick++.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libGraphicsMagick++.so.3
+%attr(755,root,root) %ghost %{_libdir}/libGraphicsMagick++.so.12
 
 %files c++-devel
 %defattr(644,root,root,755)