rpms/GraphicsMagick/EL-5 .cvsignore, 1.2, 1.3 GraphicsMagick.spec, 1.10, 1.11 sources, 1.3, 1.4 GraphicsMagick-1.1.8-MagickSpawnVP.patch, 1.1, NONE GraphicsMagick-gslib.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Fri Sep 18 01:29:13 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/GraphicsMagick/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5872
Modified Files:
.cvsignore GraphicsMagick.spec sources
Removed Files:
GraphicsMagick-1.1.8-MagickSpawnVP.patch
GraphicsMagick-gslib.patch
Log Message:
sync w/devel branch for 1.3.7
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 27 Nov 2006 13:37:41 -0000 1.2
+++ .cvsignore 18 Sep 2009 01:29:13 -0000 1.3
@@ -1 +1 @@
-GraphicsMagick-1.1.7.tar.bz2
+GraphicsMagick-1.3.7.tar.lzma
Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-5/GraphicsMagick.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- GraphicsMagick.spec 29 Jul 2007 10:10:56 -0000 1.10
+++ GraphicsMagick.spec 18 Sep 2009 01:29:13 -0000 1.11
@@ -1,22 +1,32 @@
+
Summary: An ImageMagick fork, offering faster image generation and better quality
Name: GraphicsMagick
-Version: 1.1.8
-Release: 2%{?dist}
+Version: 1.3.7
+Release: 1%{?dist}
License: MIT
Group: Applications/Multimedia
-Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
-Patch0: GraphicsMagick-gslib.patch
-Patch1: GraphicsMagick-1.1.8-MagickSpawnVP.patch
+Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
Url: http://www.graphicsmagick.org/
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
-BuildRequires: libtiff-devel, libungif-devel, zlib-devel, perl
-BuildRequires: freetype-devel >= 2.0.1
-BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5
-BuildRequires: ghostscript-devel
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5
+BuildRequires: bzip2-devel
+BuildRequires: freetype-devel
+BuildRequires: jasper-devel
+BuildRequires: lcms-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: librsvg2-devel
+BuildRequires: libtiff-devel
+BuildRequires: libungif-devel
BuildRequires: libwmf-devel
-BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel
+BuildRequires: libxml2-devel
BuildRequires: libX11-devel libXext-devel libXt-devel
+BuildRequires: perl
+%if 0%{?fedora} > 8 || 0%{?rhel} > 5
+BuildRequires: perl-devel
+%endif
+BuildRequires: zlib-devel
%description
GraphicsMagick is a comprehensive image processing package which is initially
@@ -25,14 +35,14 @@ the GraphicsMagick Group to significantl
of the software.
%package devel
-Summary: Static libraries and header files for GraphicsMagick app development
+Summary: Libraries and header files for GraphicsMagick app development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: ghostscript-devel, bzip2-devel, libtiff-devel, libjpeg-devel
Requires: lcms-devel, pkgconfig, libX11-devel, libXext-devel, libXt-devel
%description devel
-GraphicsMagick-devel contains the static libraries and header files you'll
+GraphicsMagick-devel contains the Libraries and header files you'll
need to develop GraphicsMagick applications. GraphicsMagick is an image
manipulation program.
@@ -45,9 +55,7 @@ however.
Summary: GraphicsMagick perl bindings
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: perl >= 5.6.0
-%define perl_vendorarch %(perl -MConfig -le 'print $Config{installvendorarch}')
-BuildRequires: %{perl_vendorarch}
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description perl
Perl bindings to GraphicsMagick.
@@ -74,7 +82,7 @@ Requires: %{name}-c++ = %{version}-%{rel
Requires: %{name}-devel = %{version}-%{release}
%description c++-devel
-GraphicsMagick-devel contains the static libraries and header files you'll
+GraphicsMagick-devel contains the Libraries and header files you'll
need to develop GraphicsMagick applications using the Magick++ C++ bindings.
GraphicsMagick is an image manipulation program.
@@ -87,11 +95,15 @@ however.
%prep
%setup -q
-# Disabled, causing segfaults in the gslib code path
-#%patch0 -p 1 -b .gslib
-%patch1 -p 1 -b .spawn
-# 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 \
@@ -100,22 +112,26 @@ however.
--with-x \
--with-threads \
--with-magick_plus_plus \
- --with-gslib \
+ --without-gslib \
--with-wmf \
- --with-lzw \
--with-lcms \
- --with-rsvg \
--with-xml \
--with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
--with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
--without-dps
-make
+# 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 %{?_smp_mflags}
+make %{?_smp_mflags} perl-build
+
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} -C PerlMagick
# perlmagick: fix perl path of demo files
%{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
@@ -147,7 +163,7 @@ rm -f %{buildroot}%{_libdir}/GraphicsMa
rm -f %{buildroot}%{_libdir}/*.{a,la}
# fix multilib issues
-%ifarch x86_64 s390x ia64 ppc64
+%ifarch x86_64 s390x ia64 ppc64 sparc64
%define wordsize 64
%else
%define wordsize 32
@@ -186,12 +202,12 @@ rm -rf %{buildroot}
%postun c++ -p /sbin/ldconfig
%files
-%defattr(-,root,root)
-%doc ChangeLog Copyright.txt
-%doc index.html www/ images/
-%doc README.txt AUTHORS NEWS
-%attr(755,root,root) %{_libdir}/libGraphicsMagick.so.*
-%attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.*
+%defattr(-,root,root,-)
+%doc Copyright.txt
+%doc README.txt
+%doc %{_datadir}/doc/%{name}/
+%{_libdir}/libGraphicsMagick.so.3*
+%{_libdir}/libGraphicsMagickWand.so.2*
%{_bindir}/[a-z]*
%{_libdir}/GraphicsMagick*
%{_datadir}/GraphicsMagick*
@@ -205,18 +221,20 @@ rm -rf %{buildroot}
%{_libdir}/libGraphicsMagickWand.so
%{_libdir}/pkgconfig/GraphicsMagick.pc
%{_libdir}/pkgconfig/GraphicsMagickWand.pc
-%{_includedir}/GraphicsMagick/
+%dir %{_includedir}/GraphicsMagick/
+%{_includedir}/GraphicsMagick/magick/
+%{_includedir}/GraphicsMagick/wand/
%{_mandir}/man1/GraphicsMagick-config.*
%{_mandir}/man1/GraphicsMagickWand-config.*
%files c++
%defattr(-,root,root,-)
-%{_libdir}/libGraphicsMagick++.so.*
+%{_libdir}/libGraphicsMagick++.so.3*
%files c++-devel
%defattr(-,root,root,-)
%{_bindir}/GraphicsMagick++-config
-%{_includedir}/GraphicsMagick/Magick++
+%{_includedir}/GraphicsMagick/Magick++/
%{_includedir}/GraphicsMagick/Magick++.h
%{_libdir}/libGraphicsMagick++.so
%{_libdir}/pkgconfig/GraphicsMagick++.pc
@@ -229,6 +247,59 @@ rm -rf %{buildroot}
%changelog
+* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-1
+- GraphicsMagick-1.3.7
+
+* Mon Aug 3 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.3.6-2
+- Use lzma-compressed upstream source tarball.
+
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> 1.3.6-1
+- GraphicsMagick-1.3.6
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jun 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.5-1
+- GraphicsMagick-1.3.5, ABI break (#487605)
+- --without-libgs (for now, per upstream advice)
+- BR: jasper-devel
+
+* Tue Jun 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 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 <rel-eng at lists.fedoraproject.org> - 1.1.14-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-3
+- own all files properly
+
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-2
+- turns out we do need gcc43 patch
+
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-1
+- update to 1.1.14
+- fix perl issue (bz 454087)
+
+* Sun Jun 01 2008 Dennis Gilmore <dennis at ausil.us> - 1.1.10-4
+- sparc64 is a 64 bit arch
+
+* Mon Feb 11 2008 Andreas Thienemann <andreas at bawue.net> - 1.1.10-3
+- Added patch to include cstring instead of string, fixing gcc4.3 build issue
+
+* Mon Feb 11 2008 Andreas Thienemann <andreas at bawue.net> - 1.1.10-2
+- Rebuilt against gcc 4.3
+
+* Mon Jan 28 2008 Andreas Thienemann <andreas at bawue.net> - 1.1.10-1
+- Upgraded to 1.1.10
+- Fixed linking problem with the Perl module. #365901
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.1.8-3
+- Rebuild for selinux ppc32 issue.
+
* Sun Jul 29 2007 Andreas Thienemann <andreas at bawue.net> - 1.1.8-2
- Building without gslib support as it results in segfaults.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 29 Jul 2007 09:56:22 -0000 1.3
+++ sources 18 Sep 2009 01:29:13 -0000 1.4
@@ -1 +1 @@
-0a673c0d5b3b8152c2c69e9fbbb7c1d9 GraphicsMagick-1.1.8.tar.bz2
+8a1ccf10d15816206426a9e716def9ac GraphicsMagick-1.3.7.tar.lzma
--- GraphicsMagick-1.1.8-MagickSpawnVP.patch DELETED ---
--- GraphicsMagick-gslib.patch DELETED ---
More information about the scm-commits
mailing list