rpms/GraphicsMagick/devel .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
Wed Jul 1 15:16:44 UTC 2009


Author: rdieter

Update of /cvs/pkgs/rpms/GraphicsMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27040

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:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	30 Jun 2009 15:19:51 -0000	1.7
+++ .cvsignore	1 Jul 2009 15:16:12 -0000	1.8
@@ -1 +1 @@
-GraphicsMagick-1.1.15.tar.bz2
+GraphicsMagick-1.3.5.tar.bz2


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- GraphicsMagick.spec	30 Jun 2009 15:19:51 -0000	1.24
+++ GraphicsMagick.spec	1 Jul 2009 15:16:13 -0000	1.25
@@ -1,15 +1,11 @@
+
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
-Version: 1.1.15
+Version: 1.3.5
 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
 Url: http://www.graphicsmagick.org/
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -17,7 +13,7 @@ BuildRequires: bzip2-devel, freetype-dev
 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: jasper-devel
 BuildRequires: libwmf-devel, perl-devel
 BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel
 BuildRequires: libX11-devel libXext-devel libXt-devel
@@ -29,14 +25,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.
 
@@ -76,7 +72,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.
 
@@ -89,13 +85,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 +102,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 \
@@ -205,10 +192,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*
@@ -222,18 +209,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
@@ -246,6 +235,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	30 Jun 2009 15:19:51 -0000	1.7
+++ sources	1 Jul 2009 15:16:13 -0000	1.8
@@ -1 +1 @@
-e8b1393b14356fc2baf0f79db100cce8  GraphicsMagick-1.1.15.tar.bz2
+695d94588437ef3a12b971d7ab672d8f  GraphicsMagick-1.3.5.tar.bz2


--- 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