rpms/GraphicsMagick/F-8 GraphicsMagick-perl.patch, NONE, 1.1 GraphicsMagick.spec, 1.13, 1.14 sources, 1.3, 1.4

[Andreas Thienemann (ixs)]

Author: ixs

Update of /cvs/pkgs/rpms/GraphicsMagick/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20818/F-8

Modified Files:
	GraphicsMagick.spec sources 
Added Files:
	GraphicsMagick-perl.patch 
Log Message:
* 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


GraphicsMagick-perl.patch:

--- NEW FILE GraphicsMagick-perl.patch ---
diff -up GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.orig GraphicsMagick-1.1.10/PerlMagick/Makefile.PL
--- GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.orig	2008-01-28 17:48:28.000000000 +0100
+++ GraphicsMagick-1.1.10/PerlMagick/Makefile.PL	2008-01-28 17:48:58.000000000 +0100
@@ -62,7 +62,7 @@ WriteMakefile
    'INSTALLBIN'	=> '/usr/local/bin',
 
    # Library specification
-   'LIBS'	=> ['-L/usr/local/lib -R/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/home/glennrp/CVS/ImageMagick/magick -lGraphicsMagick -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lgs -lpng -lfpx -lwmflite -lXext -lSM -lICE -lX11 -lsocket -lnsl -lbz2 -lxml2 -lz -lpthread -lm'],
+   'LIBS'	=> ['-L/usr/local/lib -R/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/home/glennrp/CVS/ImageMagick/magick -L../magick/.libs -lGraphicsMagick -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lgs -lpng -lfpx -lwmflite -lXext -lSM -lICE -lX11 -lsocket -lnsl -lbz2 -lxml2 -lz -lpthread -lm'],
 
    # Perl binary name (if a Perl binary is built)
    'MAP_TARGET'	=> 'PerlMagick',
diff -up GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in.orig GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in
--- GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in.orig	2008-01-28 17:48:34.000000000 +0100
+++ GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in	2008-01-28 17:48:58.000000000 +0100
@@ -57,7 +57,7 @@ WriteMakefile
    'INSTALLBIN'	=> '@BIN_DIR@',
 
    # Library specification
-   'LIBS'	=> ['-L at MAGICKLIBDIR@ -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
+   'LIBS'	=> ['-L at MAGICKLIBDIR@ -L../magick/.libs -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
 
    # Perl binary name (if a Perl binary is built)
    'MAP_TARGET'	=> 'PerlMagick',


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-8/GraphicsMagick.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- GraphicsMagick.spec	29 Aug 2007 04:19:57 -0000	1.13
+++ GraphicsMagick.spec	28 Jan 2008 17:21:52 -0000	1.14
@@ -1,12 +1,12 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
-Version: 1.1.8
-Release: 3%{?dist}
+Version: 1.1.10
+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
+Patch1: GraphicsMagick-perl.patch
 Url: http://www.graphicsmagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -89,7 +89,7 @@
 %setup -q
 # Disabled, causing segfaults in the gslib code path
 #%patch0 -p 1 -b .gslib 
-%patch1 -p 1 -b .spawn
+%patch1 -p 1 -b .perl
 # Regenerating configure script
 #autoconf
 
@@ -229,6 +229,10 @@
 
 
 %changelog
+* 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.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Jul 2007 18:24:57 -0000	1.3
+++ sources	28 Jan 2008 17:21:52 -0000	1.4
@@ -1 +1 @@
-0a673c0d5b3b8152c2c69e9fbbb7c1d9  GraphicsMagick-1.1.8.tar.bz2
+fb8a223ad7d7369970166b2266cb41e4  GraphicsMagick-1.1.10.tar.bz2