rpms/GraphicsMagick/devel .cvsignore, 1.4, 1.5 GraphicsMagick-perl.patch, 1.1, 1.2 GraphicsMagick.spec, 1.19, 1.20 sources, 1.4, 1.5
Tom Callaway
spot at fedoraproject.org
Thu Sep 11 14:07:57 UTC 2008
Author: spot
Update of /cvs/pkgs/rpms/GraphicsMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11767
Modified Files:
.cvsignore GraphicsMagick-perl.patch GraphicsMagick.spec
sources
Log Message:
update to 1.2.5, fix perl bits
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 28 Jan 2008 17:21:57 -0000 1.4
+++ .cvsignore 11 Sep 2008 14:07:27 -0000 1.5
@@ -1 +1 @@
-GraphicsMagick-1.1.10.tar.bz2
+GraphicsMagick-1.2.5.tar.bz2
GraphicsMagick-perl.patch:
Index: GraphicsMagick-perl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/GraphicsMagick-perl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GraphicsMagick-perl.patch 28 Jan 2008 17:21:57 -0000 1.1
+++ GraphicsMagick-perl.patch 11 Sep 2008 14:07:27 -0000 1.2
@@ -1,24 +1,24 @@
-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',
+diff -up GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.in.perl GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.in
+--- GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.in.perl 2008-05-18 17:21:59.000000000 -0400
++++ GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.in 2008-09-11 08:54:06.000000000 -0400
+@@ -61,7 +61,7 @@ WriteMakefile
+ 'INSTALLBIN' => '@BIN_DIR@',
# 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'],
+- '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',
-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
+diff -up GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.perl GraphicsMagick-1.2.5/PerlMagick/Makefile.PL
+--- GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.perl 2004-04-18 18:20:51.000000000 -0400
++++ GraphicsMagick-1.2.5/PerlMagick/Makefile.PL 2008-09-11 08:57:44.000000000 -0400
@@ -57,7 +57,7 @@ WriteMakefile
- 'INSTALLBIN' => '@BIN_DIR@',
+ 'INSTALLBIN' => '/usr/local/bin',
# Library specification
-- 'LIBS' => ['-L at MAGICKLIBDIR@ -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
-+ 'LIBS' => ['-L at MAGICKLIBDIR@ -L../magick/.libs -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
+- 'LIBS' => ['-L/home/bfriesen/src/graphics/GraphicsMagick-Web/magick/.libs -lGraphicsMagick -L/usr/local/lib -R/usr/local/lib -R/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib -L/usr/local/lib -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lwmflite -ldpstk -ldps -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lc_r'],
++ 'LIBS' => ['-L/home/bfriesen/src/graphics/GraphicsMagick-Web/magick/.libs -L../magick/.libs -lGraphicsMagick -L/usr/local/lib -R/usr/local/lib -R/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib -L/usr/local/lib -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lwmflite -ldpstk -ldps -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lc_r'],
# Perl binary name (if a Perl binary is built)
'MAP_TARGET' => 'PerlMagick',
Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- GraphicsMagick.spec 2 Jun 2008 03:48:06 -0000 1.19
+++ GraphicsMagick.spec 11 Sep 2008 14:07:27 -0000 1.20
@@ -1,13 +1,12 @@
Summary: An ImageMagick fork, offering faster image generation and better quality
Name: GraphicsMagick
-Version: 1.1.10
-Release: 4%{?dist}
+Version: 1.2.5
+Release: 1%{?dist}
License: MIT
Group: Applications/Multimedia
Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
Patch0: GraphicsMagick-gslib.patch
Patch1: GraphicsMagick-perl.patch
-Patch2: GraphicsMagick-1.1.10-gcc43.patch
Url: http://www.graphicsmagick.org/
Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -46,9 +45,7 @@
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.
@@ -91,10 +88,12 @@
# Disabled, causing segfaults in the gslib code path
#%patch0 -p 1 -b .gslib
%patch1 -p 1 -b .perl
-%patch2 -p 1 -b .gcc43
# Regenerating configure script
#autoconf
+iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8
+mv -f ChangeLog.utf8 ChangeLog
+
%build
%configure --enable-shared \
--with-modules \
@@ -112,6 +111,9 @@
--with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
--without-dps
+# 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
%install
@@ -188,10 +190,9 @@
%postun c++ -p /sbin/ldconfig
%files
-%defattr(-,root,root)
-%doc ChangeLog Copyright.txt
-%doc index.html www/ images/
-%doc README.txt AUTHORS NEWS
+%defattr(-,root,root,-)
+%doc README.txt AUTHORS.txt
+%doc %{_datadir}/doc/%{name}/
%attr(755,root,root) %{_libdir}/libGraphicsMagick.so.*
%attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.*
%{_bindir}/[a-z]*
@@ -231,6 +232,10 @@
%changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.5-1
+- update to 1.2.5
+- fix perl issues
+
* Sun Jun 01 2008 Dennis Gilmore <dennis at ausil.us> - 1.1.10-4
- sparc64 is a 64 bit arch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 28 Jan 2008 17:21:57 -0000 1.4
+++ sources 11 Sep 2008 14:07:27 -0000 1.5
@@ -1 +1 @@
-fb8a223ad7d7369970166b2266cb41e4 GraphicsMagick-1.1.10.tar.bz2
+a023a1561ec0780f25f5a4f0cf208053 GraphicsMagick-1.2.5.tar.bz2
More information about the fedora-extras-commits
mailing list