rpms/GraphicsMagick/F-11 .cvsignore, 1.7, 1.8 GraphicsMagick.spec, 1.24, 1.25 sources, 1.7, 1.8 GraphicsMagick-1.1.10-gcc43.patch, 1.2, NONE GraphicsMagick-1.1.15-multilib.patch, 1.1, NONE GraphicsMagick-gslib.patch, 1.1, NONE GraphicsMagick-perl.patch, 1.3, NONE

Rex Dieter rdieter at fedoraproject.org
Fri Sep 18 16:09:47 UTC 2009 

Author: rdieter

Update of /cvs/pkgs/rpms/GraphicsMagick/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13700

Modified Files:
	.cvsignore GraphicsMagick.spec sources 
Removed Files:
	GraphicsMagick-1.1.10-gcc43.patch 
	GraphicsMagick-1.1.15-multilib.patch 
	GraphicsMagick-gslib.patch GraphicsMagick-perl.patch 
Log Message:
sync w/devel branch for 1.3.7 goodness



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	30 Jun 2009 16:41:47 -0000	1.7
+++ .cvsignore	18 Sep 2009 16:09:46 -0000	1.8
@@ -1 +1 @@
-GraphicsMagick-1.1.15.tar.bz2
+GraphicsMagick-1.3.7.tar.lzma


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-11/GraphicsMagick.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- GraphicsMagick.spec	30 Jun 2009 16:41:47 -0000	1.24
+++ GraphicsMagick.spec	18 Sep 2009 16:09:47 -0000	1.25
@@ -1,26 +1,32 @@
+
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
-Version: 1.1.15
+Version: 1.3.7
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Multimedia
-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
+Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
 Url: http://www.graphicsmagick.org/
 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
-BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5
-BuildRequires: ghostscript-devel
-BuildRequires: libwmf-devel, perl-devel
-BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel
+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: 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
@@ -36,7 +42,7 @@ Requires: ghostscript-devel, bzip2-devel
 Requires: lcms-devel, pkgconfig, libX11-devel, libXext-devel, libXt-devel
 
 %description devel
-GraphicsMagick-devel contains the 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.
 
@@ -76,7 +82,7 @@ Requires: %{name}-c++ = %{version}-%{rel
 Requires: %{name}-devel = %{version}-%{release}
 
 %description c++-devel
-GraphicsMagick-devel contains the 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.
 
@@ -89,13 +95,6 @@ however.
 
 %prep
 %setup -q
-# Disabled, causing segfaults in the gslib code path
-#%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
@@ -113,11 +112,9 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{
            --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 \
@@ -127,12 +124,14 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{
 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
@@ -205,10 +204,10 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc Copyright.txt
-%doc README.txt AUTHORS
+%doc README.txt
 %doc %{_datadir}/doc/%{name}/
-%attr(755,root,root) %{_libdir}/libGraphicsMagick.so.1*
-%attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.0*
+%{_libdir}/libGraphicsMagick.so.3*
+%{_libdir}/libGraphicsMagickWand.so.2*
 %{_bindir}/[a-z]*
 %{_libdir}/GraphicsMagick*
 %{_datadir}/GraphicsMagick*
@@ -230,12 +229,12 @@ rm -rf %{buildroot}
 
 %files c++
 %defattr(-,root,root,-)
-%{_libdir}/libGraphicsMagick++.so.1*
+%{_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
@@ -248,6 +247,23 @@ 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	30 Jun 2009 16:41:47 -0000	1.7
+++ sources	18 Sep 2009 16:09:47 -0000	1.8
@@ -1 +1 @@
-e8b1393b14356fc2baf0f79db100cce8  GraphicsMagick-1.1.15.tar.bz2
+8a1ccf10d15816206426a9e716def9ac  GraphicsMagick-1.3.7.tar.lzma


--- GraphicsMagick-1.1.10-gcc43.patch DELETED ---


--- GraphicsMagick-1.1.15-multilib.patch DELETED ---


--- GraphicsMagick-gslib.patch DELETED ---


--- GraphicsMagick-perl.patch DELETED ---

More information about the fedora-extras-commits mailing list