diff --git a/.cvsignore b/.cvsignore index 4ae80e8..22f8692 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -GraphicsMagick-1.1.14.tar.bz2 +GraphicsMagick-1.1.15.tar.bz2 diff --git a/GraphicsMagick-1.1.15-multilib.patch b/GraphicsMagick-1.1.15-multilib.patch new file mode 100644 index 0000000..a18f917 --- /dev/null +++ b/GraphicsMagick-1.1.15-multilib.patch @@ -0,0 +1,33 @@ +diff -up GraphicsMagick-1.1.15/magick/GraphicsMagick-config.in.multilib GraphicsMagick-1.1.15/magick/GraphicsMagick-config.in +--- GraphicsMagick-1.1.15/magick/GraphicsMagick-config.in.multilib 2003-07-12 13:33:04.000000000 -0500 ++++ GraphicsMagick-1.1.15/magick/GraphicsMagick-config.in 2009-06-30 10:16:25.398703465 -0500 +@@ -30,16 +30,16 @@ while test $# -gt 0; do + echo @PACKAGE_VERSION@ + ;; + --cflags) +- echo '@CFLAGS@' ++ echo '' + ;; + --cppflags) + echo '@MAGICK_API_CPPFLAGS@' + ;; + --ldflags) +- echo '@MAGICK_API_LDFLAGS@' ++ echo '' + ;; + --libs) +- echo '@MAGICK_API_LIBS@' ++ echo '-lGraphicsMagick' + ;; + *) + echo "${usage}" 1>&2 +diff -up GraphicsMagick-1.1.15/magick/GraphicsMagick.pc.in.multilib GraphicsMagick-1.1.15/magick/GraphicsMagick.pc.in +--- GraphicsMagick-1.1.15/magick/GraphicsMagick.pc.in.multilib 2007-04-08 20:12:40.000000000 -0500 ++++ GraphicsMagick-1.1.15/magick/GraphicsMagick.pc.in 2009-06-30 10:16:15.015703583 -0500 +@@ -8,5 +8,5 @@ Name: GraphicsMagick + Version: @PACKAGE_VERSION@ + Description: GraphicsMagick image processing library + Requires: +-Libs: @MAGICK_API_LDFLAGS@ @MAGICK_API_LIBS@ ++Libs: -lGraphicsMagick + Cflags: -I${includedir} @MAGICK_API_CPPFLAGS@ diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec index eb22355..0b8e7d5 100644 --- a/GraphicsMagick.spec +++ b/GraphicsMagick.spec @@ -1,15 +1,18 @@ Summary: An ImageMagick fork, offering faster image generation and better quality Name: GraphicsMagick -Version: 1.1.14 -Release: 4%{?dist} +Version: 1.1.15 +Release: 1%{?dist} License: MIT Group: Applications/Multimedia -Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.bz2 Patch0: GraphicsMagick-gslib.patch Patch1: GraphicsMagick-perl.patch Patch2: GraphicsMagick-1.1.10-gcc43.patch +# hack out multilib issues, esp since we know we're in default search paths +Patch3: GraphicsMagick-1.1.15-multilib.patch Url: http://www.graphicsmagick.org/ -Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel BuildRequires: libtiff-devel, libungif-devel, zlib-devel, perl BuildRequires: freetype-devel >= 2.0.1 @@ -90,12 +93,19 @@ however. #%patch0 -p 1 -b .gslib %patch1 -p 1 -b .perl %patch2 -p1 -b .gcc43 +%patch3 -p1 -b .multilib # Regenerating configure script #autoconf iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8 mv -f ChangeLog.utf8 ChangeLog +# Avoid lib64 rpaths (FIXME: recheck this on newer releases) +%if "%{_libdir}" != "/usr/lib" +sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure +%endif + + %build %configure --enable-shared \ --with-modules \ @@ -116,7 +126,8 @@ mv -f ChangeLog.utf8 ChangeLog # Avoid bogus RPATHs on x86_64 sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool -make +make %{?_smp_mflags} + %install rm -rf %{buildroot} @@ -196,8 +207,8 @@ rm -rf %{buildroot} %doc Copyright.txt %doc README.txt AUTHORS %doc %{_datadir}/doc/%{name}/ -%attr(755,root,root) %{_libdir}/libGraphicsMagick.so.* -%attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.* +%attr(755,root,root) %{_libdir}/libGraphicsMagick.so.1* +%attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.0* %{_bindir}/[a-z]* %{_libdir}/GraphicsMagick* %{_datadir}/GraphicsMagick* @@ -235,6 +246,13 @@ rm -rf %{buildroot} %changelog +* Tue Jun 30 2009 Rex Dieter - 1.1.15-1 +- GraphicsMagick-1.1.15 +- fix BuildRoot +- multiarch conflicts in GraphicsMagick (#341381) +- broken -L in GraphicsMagick.pc (#456466) +- %%files: track sonames + * Mon Feb 23 2009 Fedora Release Engineering - 1.1.14-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 33c829f..ef00033 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4085265d4493a090557534b938ce942 GraphicsMagick-1.1.14.tar.bz2 +e8b1393b14356fc2baf0f79db100cce8 GraphicsMagick-1.1.15.tar.bz2