diff --git a/gd-2.0.34-fonts.patch b/gd-2.0.34-fonts.patch index f2f4ab4..acb119b 100644 --- a/gd-2.0.34-fonts.patch +++ b/gd-2.0.34-fonts.patch @@ -5,7 +5,7 @@ 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" ++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:/usr/share/fonts/liberation/" CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/gd-2.0.34-multilib.patch b/gd-2.0.34-multilib.patch index 672297f..a2c9e89 100644 --- a/gd-2.0.34-multilib.patch +++ b/gd-2.0.34-multilib.patch @@ -15,7 +15,7 @@ +Requires: +Libs: -L${libdir} -lgd +Libs.private: @LIBS@ -+Cflags: -I@includedir@ ++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 @@ diff --git a/gd.spec b/gd.spec index 5130e7f..b57bb5c 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.35 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Libraries License: MIT and GPL URL: http://www.libgd.org/Main_Page @@ -34,8 +34,7 @@ Group: Applications/Multimedia %description progs The gd-progs package includes utility programs supplied with gd, a -graphics library for creating PNG and JPEG images. If you install -these, you must also install gd. +graphics library for creating PNG and JPEG images. %package devel @@ -50,7 +49,6 @@ Requires: pkgconfig The gd-devel package contains the development libraries and header files for gd, a graphics library for creating PNG and JPEG graphics. - %prep %setup -q %patch0 -p1 -b .freetype @@ -81,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING README-JPEG.TXT index.html entities.html +%doc COPYING README-JPEG.TXT index.html %{_libdir}/*.so.* %files progs @@ -98,8 +96,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.a %{_libdir}/pkgconfig/gdlib.pc - %changelog +* Mon Nov 19 2007 Ivana Varekova 2.0.35-3 +- spec file cleanup + * Mon Nov 19 2007 Ivana Varekova 2.0.35-2 - fix gdlib.pc file