diff --git a/gd-2.0.34-fonts.patch b/gd-2.0.34-fonts.patch new file mode 100644 index 0000000..f2f4ab4 --- /dev/null +++ b/gd-2.0.34-fonts.patch @@ -0,0 +1,11 @@ +--- gd-2.0.34/Makefile.in.pom 2007-09-04 15:08:18.000000000 +0200 ++++ gd-2.0.34/Makefile.in 2007-09-04 15:58:05.000000000 +0200 +@@ -227,7 +227,7 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ -D_DEFAULT_FONTPATH="/usr/share/X11/fonts/TTF/:/usr/share/fonts/bitstream-vera/:/usr/share/fonts/dejavu-lgc/:/usr/share/fonts/default/Type1/:/usr/share/X11/fonts/Type1" + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CXX = @CXX@ diff --git a/gd-2.0.34-multilib.patch b/gd-2.0.34-multilib.patch index 63c1138..60242ac 100644 --- a/gd-2.0.34-multilib.patch +++ b/gd-2.0.34-multilib.patch @@ -1,3 +1,21 @@ +--- /dev/null 2007-09-04 12:46:47.564263777 +0200 ++++ gd-2.0.34/config/gdlib.pc.in 2007-09-04 15:17:09.000000000 +0200 +@@ -0,0 +1,15 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++bindir=@bindir@ ++ldflags=@LDFLAGS@ ++ ++ ++Name: gd-devel ++Description: A graphics library for quick creation of PNG or JPEG images ++Version: @VERSION@ ++Requires: ++Libs: -ldg ++Libs.private: @LIBS@ ++Cflags: -I@includedir@ --- gd-2.0.34/Makefile.in.pom 2007-02-03 02:41:46.000000000 +0100 +++ gd-2.0.34/Makefile.in 2007-02-08 13:34:06.000000000 +0100 @@ -341,6 +341,7 @@ @@ -42,23 +60,6 @@ uninstall-includeHEADERS uninstall-info-am \ uninstall-libLTLIBRARIES ---- gd-2.0.34/config/gdlib.pc.in.pom 2007-02-08 13:29:04.000000000 +0100 -+++ gd-2.0.34/config/gdlib.pc.in 2007-01-29 09:51:29.000000000 +0100 -@@ -0,0 +1,14 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+bindir=@bindir@ -+ldflags=@LDFLAGS@ -+ -+ -+Name: gd-devel -+Description: A graphics library for quick creation of PNG or JPEG images -+Version: @VERSION@ -+Requires: -+Libs: @LIBS@ -+Cflags: -I@includedir@ --- gd-2.0.34/config/gdlib-config.in.pom 2007-02-03 02:41:00.000000000 +0100 +++ gd-2.0.34/config/gdlib-config.in 2007-02-08 13:27:25.000000000 +0100 @@ -7,9 +7,10 @@ diff --git a/gd.spec b/gd.spec index 6540364..f579260 100644 --- a/gd.spec +++ b/gd.spec @@ -1,7 +1,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.0.34 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Libraries License: MIT and GPL URL: http://www.libgd.org/Main_Page @@ -13,6 +13,7 @@ Patch5: gd-2.0.34-sparc64.patch Patch6: gd-2.0.33-overflow.patch Patch7: gd-2.0.33-AALineThick.patch Patch8: gd-2.0.33-BoxBound.patch +Patch9: gd-2.0.34-fonts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: freetype-devel, fontconfig-devel, libX11-devel, libXpm-devel BuildRequires: libjpeg-devel, libpng-devel, zlib-devel, pkgconfig @@ -59,6 +60,7 @@ files for gd, a graphics library for creating PNG and JPEG graphics. %patch5 -p1 -b .sparc64 %patch7 -p1 -b .AALineThick %patch8 -p1 -b .bb +%patch9 -p1 -b .fonts %build %configure --disable-rpath @@ -98,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 4 2007 Ivana Varekova 2.0.34-3 +- fix font paths (#225786#5) +- fix pkgconfig Libs flag (#225786#4) + * Thu Feb 22 2007 Ivana Varekova 2.0.34-2 - incorporate package review feedback