X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=GraphicsMagick.spec;h=f16ac0af965e21a10c1697ab349c8ffb7863425b;hb=ec4e3c14e5738f841381895a8155a4f253dd5d1b;hp=52415705fb8a50f0f65d619442628c7550284e1e;hpb=3d4ab7de6a14c7eea9f1dd9235d6ee00a97ad00d;p=packages%2FGraphicsMagick.git

diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index 5241570..f16ac0a 100644
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -19,16 +19,12 @@ 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.1.7
+Version:	1.2.3
 Release:	2
-License:	Apache-like
+License:	MIT
 Group:		X11/Applications/Graphics
-Source0:	ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/%{name}-%{version}.tar.bz2
-# Source0-md5:	f75d830ca623bf10385b3ad62c48437a
-Patch0:		%{name}-libpath.patch
-Patch1:		%{name}-system-libltdl.patch
-Patch2:		%{name}-link.patch
-Patch3:		%{name}-png.patch
+Source0:	http://dl.sourceforge.net/graphicsmagick/%{name}-%{version}.tar.bz2
+# Source0-md5:	6326520b005f76f6c7eae26409c9dea0
 URL:		http://www.graphicsmagick.org/
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake >= 1:1.8
@@ -36,15 +32,15 @@ BuildRequires:	bzip2-devel >= 1.0.1
 BuildRequires:	expat-devel >= 1.95.7
 BuildRequires:	freetype-devel >= 2.0.2-2
 %{?with_gs:BuildRequires:	ghostscript-devel}
-%{?with_jasper:BuildRequires:	jasper-devel >= 1.700.5}
-BuildRequires:	jbigkit-devel
-BuildRequires:	lcms-devel
+%{?with_jasper:BuildRequires:	jasper-devel >= 1.900.1}
+BuildRequires:	jbigkit-devel >= 1.6
+BuildRequires:	lcms-devel >= 1.16
 %{?with_fpx:BuildRequires:	libfpx-devel >= 1.2.0.4-3}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libltdl-devel
-BuildRequires:	libpng-devel >= 1.0.8
+BuildRequires:	libpng-devel >= 1.2.18
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtiff-devel
+BuildRequires:	libtiff-devel >= 3.8.2
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libwmf-devel >= 2:0.2.2
 BuildRequires:	libxml2-devel >= 2.0
@@ -58,8 +54,6 @@ Requires:	%{name}-libs = %{version}-%{release}
 Obsoletes:	GraphicsMagick-coder-dps
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# we don't want "-s" here, because it would be added to `GraphicsMagick*-config --ldflags`
-%define		filterout_ld	(-Wl,)?-s (-Wl,)?--strip-all
 %define		modulesdir	%{_libdir}/GraphicsMagick-%{version}/modules-Q%{QuantumDepth}
 
 %description
@@ -88,10 +82,10 @@ nombreux formats différents.
 
 %description -l pl.UTF-8
 GraphicsMagick jest narzędziem do manipulacji, konwersji i
-wyświetlania. W skład pakietu wchodzą zarówno narzędzia X Window jak i
-do używania z linii poleceń umożliwiające edycję plików graficznych.
-Narzędzia z pakietu GraphicsMagick potrafią obsłużyć wiele różnych
-formatów graficznych.
+wyświetlania plików graficznych. W skład pakietu wchodzą zarówno
+narzędzia X Window jak i do używania z linii poleceń umożliwiające
+edycję grafiki. Narzędzia z pakietu GraphicsMagick potrafią obsłużyć
+wiele różnych formatów graficznych.
 
 %description -l pt_BR.UTF-8
 GraphicsMagick é uma ferramenta para manipular, converter e exibir
@@ -544,21 +538,10 @@ Dokumentacja do GraphicsMagick.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 find PerlMagick scripts www -type f -exec perl -pi -e 's=!%{_prefix}/local/bin/perl=!%{__perl}=' {} \;
 
-# don't require libtool 1.6
-echo -e '\nAC_DEFUN([AC_LIBTOOL_TAGS],[])' >> acinclude.m4
-
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__automake}
 %configure \
 	--enable-fast-install \
 	--enable-shared \
@@ -579,13 +562,19 @@ echo -e '\nAC_DEFUN([AC_LIBTOOL_TAGS],[])' >> acinclude.m4
 
 %{__make}
 
+cd PerlMagick
+perl Makefile.PL
+make OTHERLDFLAGS="-L../magick/.libs/"
+cd ..
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	pkgdocdir=%{_docdir}/%{name}-devel-%{version}
+	pkgdocdir=%{_docdir}/%{name}-devel-%{version} \
+	OTHERLDFLAGS="-L../magick/.libs/"
 
 install PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
 rm -f $RPM_BUILD_ROOT%{modulesdir}/{coders,filters}/*.a
@@ -607,6 +596,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/GraphicsMagick-%{version}
 %dir %{_libdir}/GraphicsMagick-%{version}/config
 %{_libdir}/GraphicsMagick-%{version}/config/*.mgk
+%attr(755,root,root) %ghost %{_libdir}/libGraphicsMagick++.so.2
+%attr(755,root,root) %ghost %{_libdir}/libGraphicsMagick.so.2
+%attr(755,root,root) %ghost %{_libdir}/libGraphicsMagickWand.so.1
 %dir %{modulesdir}
 %dir %{modulesdir}/coders
 %dir %{modulesdir}/filters
@@ -772,13 +764,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog Copyright.txt NEWS README.txt TODO.txt
+%doc AUTHORS.txt ChangeLog Copyright.txt NEWS.txt README.txt TODO.txt
 %attr(755,root,root) %{_libdir}/libGraphicsMagick.so.*.*.*
 %attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc %{_docdir}/%{name}-devel-%{version}
+%doc %{_docdir}/%{name}
 %attr(755,root,root) %{_bindir}/GraphicsMagick-config
 %attr(755,root,root) %{_bindir}/GraphicsMagickWand-config
 %attr(755,root,root) %{_libdir}/libGraphicsMagick.so