rpms/gd
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

spec file cleanup add fontdir

Browse Source
This commit is contained in:
Ivana Varekova 2007-11-19 15:23:23 +00:00
parent 1a0f8e7d58
commit d6846d2672
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gd-2.0.34-fonts.patch
View File

@ -5,7 +5,7 @@
CC = @CC@ CC = @CC@
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ -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@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CXX = @CXX@ CXX = @CXX@

2
gd-2.0.34-multilib.patch
View File

@ -15,7 +15,7 @@
+Requires: +Requires:
+Libs: -L${libdir} -lgd +Libs: -L${libdir} -lgd
+Libs.private: @LIBS@ +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.pom 2007-02-03 02:41:46.000000000 +0100
+++ gd-2.0.34/Makefile.in 2007-02-08 13:34:06.000000000 +0100 +++ gd-2.0.34/Makefile.in 2007-02-08 13:34:06.000000000 +0100
@@ -341,6 +341,7 @@ @@ -341,6 +341,7 @@

12
gd.spec
View File

@ -1,7 +1,7 @@
Summary: A graphics library for quick creation of PNG or JPEG images Summary: A graphics library for quick creation of PNG or JPEG images
Name: gd Name: gd
Version: 2.0.35 Version: 2.0.35
Release: 2%{?dist} Release: 3%{?dist}
Group: System Environment/Libraries Group: System Environment/Libraries
License: MIT and GPL License: MIT and GPL
URL: http://www.libgd.org/Main_Page URL: http://www.libgd.org/Main_Page
@ -34,8 +34,7 @@ Group: Applications/Multimedia
%description progs %description progs
The gd-progs package includes utility programs supplied with gd, a The gd-progs package includes utility programs supplied with gd, a
graphics library for creating PNG and JPEG images. If you install graphics library for creating PNG and JPEG images.
these, you must also install gd.
%package devel %package devel
@ -50,7 +49,6 @@ Requires: pkgconfig
The gd-devel package contains the development libraries and header The gd-devel package contains the development libraries and header
files for gd, a graphics library for creating PNG and JPEG graphics. files for gd, a graphics library for creating PNG and JPEG graphics.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .freetype %patch0 -p1 -b .freetype
@ -81,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING README-JPEG.TXT index.html entities.html %doc COPYING README-JPEG.TXT index.html
%{_libdir}/*.so.* %{_libdir}/*.so.*
%files progs %files progs
@ -98,8 +96,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.a %{_libdir}/*.a
%{_libdir}/pkgconfig/gdlib.pc %{_libdir}/pkgconfig/gdlib.pc
%changelog %changelog
* Mon Nov 19 2007 Ivana Varekova <varekova@redhat.com> 2.0.35-3
- spec file cleanup
* Mon Nov 19 2007 Ivana Varekova <varekova@redhat.com> 2.0.35-2 * Mon Nov 19 2007 Ivana Varekova <varekova@redhat.com> 2.0.35-2
- fix gdlib.pc file - fix gdlib.pc file