OBS User unknown 2007-12-22 18:32:58 +00:00 committed by Git OBS Bridge
parent b9a6e5a681
commit 93fff9fd49
3 changed files with 37 additions and 19 deletions

13
gd-2.0.35-config.patch Normal file
View File

@ -0,0 +1,13 @@
Index: config/gdlib-config.in
===================================================================
--- config/gdlib-config.in.orig 2006-10-11 11:46:22.000000000 +0200
+++ config/gdlib-config.in 2007-12-20 03:59:07.000000000 +0100
@@ -71,7 +71,7 @@ while test $# -gt 0; do
echo @LDFLAGS@
;;
--libs)
- echo @LIBS@ @LIBICONV@
+ echo -l@GDLIBNAME@
;;
--cflags|--includes)
echo -I@includedir@

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Dec 20 04:22:14 CET 2007 - crrodriguez@suse.de
- remove static libraries and "la" files
- devel package dependency cleanup
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 9 09:09:51 CEST 2007 - anosek@suse.cz Mon Jul 9 09:09:51 CEST 2007 - anosek@suse.cz

37
gd.spec
View File

@ -14,11 +14,12 @@ Name: gd
BuildRequires: fontconfig-devel freetype2-devel libjpeg-devel libpng-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXpm-devel BuildRequires: fontconfig-devel freetype2-devel libjpeg-devel libpng-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXpm-devel
License: X11/MIT License: X11/MIT
Group: System/Libraries Group: System/Libraries
Provides: gdlib
Obsoletes: gdlib Obsoletes: gdlib
Autoreqprov: on AutoReqProv: on
Version: 2.0.35 Version: 2.0.35
Release: 1 Release: 38
URL: http://www.libgd.org/ Url: http://www.libgd.org/
Summary: A Drawing Library for Programs That Use PNG and JPEG Output Summary: A Drawing Library for Programs That Use PNG and JPEG Output
Source: gd-%{version}.tar.bz2 Source: gd-%{version}.tar.bz2
Patch0: gd-%{version}-warn.patch Patch0: gd-%{version}-warn.patch
@ -27,6 +28,7 @@ Patch2: gd-format.patch
Patch3: gd-aliasing.patch Patch3: gd-aliasing.patch
Patch4: gd-security.patch Patch4: gd-security.patch
Patch6: gd-fontpath.patch Patch6: gd-fontpath.patch
Patch7: gd-2.0.35-config.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -42,11 +44,10 @@ Authors:
Thomas Boutell <boutell@boutell.com> Thomas Boutell <boutell@boutell.com>
%package devel %package devel
Requires: %{name} = %{version} libexpat-devel fontconfig-devel freetype2-devel glibc-devel libjpeg-devel libpng-devel xorg-x11-libXpm-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel Requires: %{name} = %{version} glibc-devel
License: X11/MIT License: X11/MIT
Summary: Drawing Library for Programs with PNG and JPEG Output Summary: Drawing Library for Programs with PNG and JPEG Output
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Autoreqprov: on
%description devel %description devel
gd allows code to quickly draw images complete with lines, arcs, text, gd allows code to quickly draw images complete with lines, arcs, text,
@ -68,19 +69,18 @@ Authors:
%patch3 %patch3
%patch4 %patch4
%patch6 %patch6
%patch7
%build %build
%{suse_update_config -f}
autoreconf -fi autoreconf -fi
CFLAGS="$RPM_OPT_FLAGS -fstack-protector -I%{_includedir}/freetype2" \ export CFLAGS="$RPM_OPT_FLAGS"
CPPFLAGS="-I%{_includedir}/freetype2" \ export CPPFLAGS="%{optflags}"
./configure \ %configure \
--prefix=%{_prefix} \
--libdir=%{_libdir} \
--with-freetype \ --with-freetype \
--with-jpeg \ --with-jpeg \
--with-png \ --with-png \
--with-xpm \ --with-xpm \
--disable-static \
--with-pic --with-pic
make make
#run test programs #run test programs
@ -98,17 +98,14 @@ grep -v "gdtest.png, gdtest.wbmp.*ERROR" gdtest.log | grep ERROR && exit 1
#done #done
%install %install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post %post -p /sbin/ldconfig
%run_ldconfig
%postun %postun -p /sbin/ldconfig
%run_ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
@ -129,13 +126,15 @@ rm -rf $RPM_BUILD_ROOT
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
/usr/bin/gdlib-config %{_bindir}/gdlib-config
%{_includedir}/* %{_includedir}/*
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/*.a %exclude %{_libdir}/*.la
%{_libdir}/*.la
%changelog %changelog
* Thu Dec 20 2007 - crrodriguez@suse.de
- remove static libraries and "la" files
- devel package dependency cleanup
* Mon Jul 09 2007 - anosek@suse.cz * Mon Jul 09 2007 - anosek@suse.cz
- updated to version 2.0.35 - updated to version 2.0.35
* Fix valgrind error in gdImageFillTiled (Nuno Lopes) * Fix valgrind error in gdImageFillTiled (Nuno Lopes)