This commit is contained in:
parent
b9a6e5a681
commit
93fff9fd49
13
gd-2.0.35-config.patch
Normal file
13
gd-2.0.35-config.patch
Normal 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@
|
@ -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
|
||||
|
||||
|
37
gd.spec
37
gd.spec
@ -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
|
||||
License: X11/MIT
|
||||
Group: System/Libraries
|
||||
Provides: gdlib
|
||||
Obsoletes: gdlib
|
||||
Autoreqprov: on
|
||||
AutoReqProv: on
|
||||
Version: 2.0.35
|
||||
Release: 1
|
||||
URL: http://www.libgd.org/
|
||||
Release: 38
|
||||
Url: http://www.libgd.org/
|
||||
Summary: A Drawing Library for Programs That Use PNG and JPEG Output
|
||||
Source: gd-%{version}.tar.bz2
|
||||
Patch0: gd-%{version}-warn.patch
|
||||
@ -27,6 +28,7 @@ Patch2: gd-format.patch
|
||||
Patch3: gd-aliasing.patch
|
||||
Patch4: gd-security.patch
|
||||
Patch6: gd-fontpath.patch
|
||||
Patch7: gd-2.0.35-config.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -42,11 +44,10 @@ Authors:
|
||||
Thomas Boutell <boutell@boutell.com>
|
||||
|
||||
%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
|
||||
Summary: Drawing Library for Programs with PNG and JPEG Output
|
||||
Group: Development/Libraries/C and C++
|
||||
Autoreqprov: on
|
||||
|
||||
%description devel
|
||||
gd allows code to quickly draw images complete with lines, arcs, text,
|
||||
@ -68,19 +69,18 @@ Authors:
|
||||
%patch3
|
||||
%patch4
|
||||
%patch6
|
||||
%patch7
|
||||
|
||||
%build
|
||||
%{suse_update_config -f}
|
||||
autoreconf -fi
|
||||
CFLAGS="$RPM_OPT_FLAGS -fstack-protector -I%{_includedir}/freetype2" \
|
||||
CPPFLAGS="-I%{_includedir}/freetype2" \
|
||||
./configure \
|
||||
--prefix=%{_prefix} \
|
||||
--libdir=%{_libdir} \
|
||||
export CFLAGS="$RPM_OPT_FLAGS"
|
||||
export CPPFLAGS="%{optflags}"
|
||||
%configure \
|
||||
--with-freetype \
|
||||
--with-jpeg \
|
||||
--with-png \
|
||||
--with-xpm \
|
||||
--disable-static \
|
||||
--with-pic
|
||||
make
|
||||
#run test programs
|
||||
@ -98,17 +98,14 @@ grep -v "gdtest.png, gdtest.wbmp.*ERROR" gdtest.log | grep ERROR && exit 1
|
||||
#done
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
%run_ldconfig
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun
|
||||
%run_ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
@ -129,13 +126,15 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
/usr/bin/gdlib-config
|
||||
%{_bindir}/gdlib-config
|
||||
%{_includedir}/*
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/*.a
|
||||
%{_libdir}/*.la
|
||||
%exclude %{_libdir}/*.la
|
||||
|
||||
%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
|
||||
- updated to version 2.0.35
|
||||
* Fix valgrind error in gdImageFillTiled (Nuno Lopes)
|
||||
|
Loading…
x
Reference in New Issue
Block a user