rpms/gd/devel gd-2.0.34-fonts.patch, NONE, 1.1 gd-2.0.34-multilib.patch, 1.1, 1.2 gd.spec, 1.43, 1.44

[Ivana Varekova (varekova)]

Author: varekova

Update of /cvs/pkgs/rpms/gd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13637

Modified Files:
	gd-2.0.34-multilib.patch gd.spec 
Added Files:
	gd-2.0.34-fonts.patch 
Log Message:
- fix font paths (#225786#5)
- fix pkgconfig Libs flag (#225786#4)


gd-2.0.34-fonts.patch:

--- NEW FILE gd-2.0.34-fonts.patch ---
--- 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@

gd-2.0.34-multilib.patch:

Index: gd-2.0.34-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gd/devel/gd-2.0.34-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gd-2.0.34-multilib.patch	8 Feb 2007 13:09:04 -0000	1.1
+++ gd-2.0.34-multilib.patch	4 Sep 2007 14:08:31 -0000	1.2
@@ -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 at 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 at 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 @@


Index: gd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gd/devel/gd.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gd.spec	27 Aug 2007 08:47:16 -0000	1.43
+++ gd.spec	4 Sep 2007 14:08:31 -0000	1.44
@@ -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 @@
 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 @@
 %patch5 -p1 -b .sparc64 
 %patch7 -p1 -b .AALineThick
 %patch8 -p1 -b .bb
+%patch9 -p1 -b .fonts
 
 %build
 %configure --disable-rpath
@@ -98,6 +100,10 @@
 
 
 %changelog
+* Tue Sep  4 2007 Ivana Varekova <varekova at redhat.com> 2.0.34-3
+- fix font paths (#225786#5)
+- fix pkgconfig Libs flag (#225786#4)
+
 * Thu Feb 22 2007 Ivana Varekova <varekova at redhat.com> 2.0.34-2
 - incorporate package review feedback