Browse Source

gd:
- import patches from fedora package
- modified font path patch for Vine Linux
- drop static library
- remove "-DJISX0208"
- add "-DHAVE_ICONV -DHAVE_STDARG_H -DHAVE_ERRNO_H""

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7485 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 12 years ago
parent
commit
13c9ccb1eb
1 changed files with 35 additions and 19 deletions
  1. 35 19
      g/gd/gd-vl.spec

+ 35 - 19
g/gd/gd-vl.spec

@@ -3,10 +3,19 @@ Summary: A graphics library for drawing .png files.
 Summary(ja): PNGイメージファイルを描写するためのグラフィックライブラリ
 Name: gd
 Version: 2.0.35
-Release: 7%{_dist_release}
+Release: 8%{_dist_release}
 Source0: http://www.libgd.org/releases/gd-%{version}.tar.bz2
-Patch1:  gd-2.0.35-overflow.patch
-Patch2:  gd-2.0.35-CVE-2009-3546.diff
+Patch0:        gd-2.0.33-freetype.patch
+Patch3:        gd-2.0.34-multilib.patch
+Patch4:        gd-loop.patch
+Patch5:        gd-2.0.34-sparc64.patch
+Patch6:        gd-2.0.35-overflow.patch
+Patch7:        gd-2.0.35-AALineThick.patch
+Patch8:        gd-2.0.33-BoxBound.patch
+Patch9:        gd-2.0.34-fonts-vine.patch
+Patch10:       gd-2.0.35-time.patch
+Patch11:       gd-2.0.35-security3.patch
+Patch12:       gd-2.0.35-runtests.patch
 License: BSD-style
 URL: http://www.libgd.org/
 Group: System Environment/Libraries
@@ -18,6 +27,7 @@ BuildRequires: libX11-devel libXpm-devel
 
 Vendor: Project Vine
 Distribution: Vine Linux
+Packager: daisuke
 
 %description
 Gd is a graphics library for drawing .png files.  Gd allows your code to
@@ -106,24 +116,28 @@ If you're installing the gd graphics library, you must install gd-devel.
 
 %prep
 %setup -q
-%patch1 -p1 -b .overflow
-%patch2 -p0 -b .CVE-2009-3546
+%patch0 -p1 -b .freetype
+%patch3 -p1 -b .mlib
+%patch4 -p1 -b .loop
+%patch6 -p1 -b .overflow
+%patch5 -p1 -b .sparc64 
+%patch7 -p1 -b .AALineThick
+%patch8 -p1 -b .bb
+%patch9 -p1 -b .fonts-vine
+%patch10 -p1 -b .time
+%patch11 -p1 -b .sec3
+%patch12 -p1 -b .runtests
+
 
 %build
-# %if %{build_compat32}
-# export CC='gcc -m32'
-# %configure CPPFLAGS="-DJISX0208"
-# make %{?_smp_mflags} LDFLAGS='-L/usr/lib -Wl,-rpath,/usr/lib  -L/usr/X11R6/lib'
-# %else
-%configure CPPFLAGS="-DJISX0208"
+%configure CPPFLAGS="-DHAVE_ICONV -DHAVE_STDARG_H -DHAVE_ERRNO_H"
 make %{?_smp_mflags}
-# %endif
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 ## remove unuse files
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
@@ -136,7 +150,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 %postun -n compat32-%{name} -p /sbin/ldconfig
 %endif
 
-# %if !%{build_compat32}
 %files
 %defattr(-,root,root)
 %doc COPYING README*
@@ -152,9 +165,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_bindir}/gdlib-config
 %{_includedir}/*
 %{_libdir}/*.so
-%{_libdir}/*.a
-#%{_libdir}/*.la
-# %endif
+%{_libdir}/pkgconfig/*.pc
 
 %if %{build_compat32}
 %files -n compat32-%{name}
@@ -163,11 +174,16 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 %files -n compat32-%{name}-devel
 %defattr(-,root,root)
 %{_libdir}/*.so
-%{_libdir}/*.a
-#%{_libdir}/*.la
 %endif
 
 %changelog
+* Tue Feb 19 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.35-8
+- import patches from fedora package
+- modified font path patch for Vine Linux
+- drop static library
+- remove "-DJISX0208"
+- add "-DHAVE_ICONV -DHAVE_STDARG_H -DHAVE_ERRNO_H""
+
 * Fri Mar 09 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.0.35-7
 - move gdlib-config from gd-progs subpackage to gd-devel subpackage