rpms/gd/devel gd-2.0.33-freetype.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 gd.spec, 1.21, 1.22

[fedora-cvs-commits at redhat.com]

Author: pknirsch

Update of /cvs/dist/rpms/gd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17822

Modified Files:
	.cvsignore gd.spec 
Added Files:
	gd-2.0.33-freetype.patch 
Log Message:
- Fixed broken freetype-config --libs flags in configure (#165875)


gd-2.0.33-freetype.patch:
 configure |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gd-2.0.33-freetype.patch ---
--- gd-2.0.33/configure.freetype	2005-09-07 17:16:03.000000000 +0200
+++ gd-2.0.33/configure	2005-09-07 17:16:54.000000000 +0200
@@ -11705,8 +11705,8 @@
     else
       libft_INCLUDES=`$FREETYPE_CONFIG --cflags`
     fi
-    libft_LDFLAGS=`$FREETYPE_CONFIG --libs`
-    libft_LDFLAGS=`echo " $libft_LDFLAGS" |sed 's/ -l[^ ][^ ]*//g'`
+    # Hack to ingore the broken freetype config --libs flags
+    libft_LDFLAGS=""
   else
     if test -n "$FREETYPE_DIR"; then
       libft_INCLUDES="-I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gd/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	22 Mar 2005 17:58:20 -0000	1.10
+++ .cvsignore	7 Sep 2005 15:21:28 -0000	1.11
@@ -1,3 +1 @@
-gd-2.0.28.tar.gz
-gd-2.0.32.tar.gz
 gd-2.0.33.tar.gz


Index: gd.spec
===================================================================
RCS file: /cvs/dist/rpms/gd/devel/gd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gd.spec	17 Apr 2005 22:21:54 -0000	1.21
+++ gd.spec	7 Sep 2005 15:21:28 -0000	1.22
@@ -1,11 +1,12 @@
 Summary:        A graphics library for quick creation of PNG or JPEG images
 Name:           gd
 Version:        2.0.33
-Release:        2
+Release:        3
 Group:          System Environment/Libraries
 License:        BSD-style
 URL:            http://www.boutell.com/gd/
 Source0:        http://www.boutell.com/gd/http/%{name}-%{version}.tar.gz
+Patch0:         gd-2.0.33-freetype.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  freetype-devel, fontconfig-devel, xorg-x11-devel
 BuildRequires:  libjpeg-devel, libpng-devel, zlib-devel
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -n .freetype
 
 %build
 %configure --disable-rpath
@@ -81,6 +83,9 @@
 
 
 %changelog
+* Wed Sep 07 2005 Phil Knirsch <pknirsch at redhat.com> 2.0.33-3
+- Fixed broken freetype-config --libs flags in configure (#165875)
+
 * Sun Apr 17 2005 Warren Togami <wtogami at redhat.com> 2.0.33-2
 - devel reqs (#155183 thias)