[gd] - update to 2.1.0 (post RC2 git snapshot)
Remi Collet
remi at fedoraproject.org
Tue Jun 11 06:05:03 UTC 2013
commit 5a51fe9ae704195b018382bf705e5913690b3d19
Author: Remi Collet <remi at fedoraproject.org>
Date: Tue Jun 11 08:04:20 2013 +0200
- update to 2.1.0 (post RC2 git snapshot)
.gitignore | 1 +
gd-2.0.33-BoxBound.patch | 22 -
gd-2.0.34-multilib.patch | 113 ---
gd-2.0.34-sparc64.patch | 13 -
gd-2.0.35-AALineThick.patch | 66 --
gd-2.0.35-overflow.patch | 13 -
gd-2.0.35-runtests.patch | 23 -
gd-2.0.35-security3.patch | 12 -
gd-2.0.35-time.patch | 12 -
gd-2.1.0-multilib.patch | 33 +
gd-aarch64.patch | 1755 -------------------------------------------
gd-loop.patch | 24 -
gd-sa1.patch | 59 --
gd-sa2.patch | 515 -------------
gd-sa3.patch | 31 -
gd-sa4.patch | 148 ----
gd.spec | 119 ++--
sources | 2 +-
18 files changed, 99 insertions(+), 2862 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 635e72a..48c0e65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
gd-2.0.35.tar.bz2
+/libgd-2.1.0-725ba9de4005144d137d2a7a70f760068fc3d306.tgz
diff --git a/gd-2.1.0-multilib.patch b/gd-2.1.0-multilib.patch
new file mode 100644
index 0000000..c4fdc63
--- /dev/null
+++ b/gd-2.1.0-multilib.patch
@@ -0,0 +1,33 @@
+diff -up gd-2.1.0/config/gdlib-config.in.multilib gd-2.1.0/config/gdlib-config.in
+--- gd-2.1.0/config/gdlib-config.in.multilib 2013-04-21 16:58:17.820010758 +0200
++++ gd-2.1.0/config/gdlib-config.in 2013-04-21 16:59:27.896317922 +0200
+@@ -7,9 +7,10 @@
+ # installation directories
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=`pkg-config gdlib --variable=libdir`
+ includedir=@includedir@
+ bindir=@bindir@
++ldflags=`pkg-config gdlib --variable=ldflags`
+
+ usage()
+ {
+@@ -68,7 +69,7 @@ while test $# -gt 0; do
+ echo @GDLIB_REVISION@
+ ;;
+ --ldflags)
+- echo @LDFLAGS@
++ echo $ldflags
+ ;;
+ --libs)
+ echo -lgd @LIBS@ @LIBICONV@
+@@ -83,7 +84,7 @@ while test $# -gt 0; do
+ echo "GD library @VERSION@"
+ echo "includedir: $includedir"
+ echo "cflags: -I at includedir@"
+- echo "ldflags: @LDFLAGS@"
++ echo "ldflags: $ldflags"
+ echo "libs: @LIBS@ @LIBICONV@"
+ echo "libdir: $libdir"
+ echo "features: @FEATURES@"
diff --git a/gd.spec b/gd.spec
index ab3fa55..85e7f94 100644
--- a/gd.spec
+++ b/gd.spec
@@ -1,29 +1,36 @@
+#global prever rc2
+%global commit 725ba9de4005144d137d2a7a70f760068fc3d306
+%global short %(c=%{commit}; echo ${c:0:7})
+
Summary: A graphics library for quick creation of PNG or JPEG images
Name: gd
-Version: 2.0.35
-Release: 25%{?dist}
+Version: 2.1.0
+Release: 0.1.%{?prever}%{?short}%{?dist}
Group: System Environment/Libraries
License: MIT
-URL: http://www.libgd.org/Main_Page
-Source0: http://www.libgd.org/releases/%{name}-%{version}.tar.bz2
-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
-Patch10: gd-2.0.35-time.patch
-Patch11: gd-2.0.35-security3.patch
-Patch12: gd-2.0.35-runtests.patch
-Patch13: gd-sa1.patch
-Patch14: gd-sa2.patch
-Patch15: gd-sa3.patch
-Patch16: gd-sa4.patch
-Patch17: gd-aarch64.patch
-BuildRequires: freetype-devel, fontconfig-devel, libX11-devel, libXpm-devel
-BuildRequires: libjpeg-devel, libpng-devel, zlib-devel, pkgconfig
-# we need cmake for building test suite
-BuildRequires: cmake, chrpath
+URL: http://libgd.bitbucket.org/
+%if 0%{?commit:1}
+# git clone git at bitbucket.org:libgd/gd-libgd.git; cd gd-libgd
+# git archive --format=tgz --output=libgd-2.1.0-$(git rev-parse master).tgz --prefix=libgd-2.1.0/ master
+Source0: libgd-%{version}-%{commit}.tgz
+%else
+Source0: https://bitbucket.org/libgd/gd-libgd/downloads/libgd-%{version}%{?prever:-%{prever}}.tar.xz
+%endif
+Patch1: gd-2.1.0-multilib.patch
+
+BuildRequires: freetype-devel
+BuildRequires: fontconfig-devel
+BuildRequires: gettext-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
+BuildRequires: libvpx-devel
+BuildRequires: libX11-devel
+BuildRequires: libXpm-devel
+BuildRequires: zlib-devel
+BuildRequires: pkgconfig
+BuildRequires: libtool
+
%description
The gd graphics library allows your code to quickly draw images
@@ -35,7 +42,7 @@ browsers. Note that gd is not a paint program.
%package progs
-Requires: gd = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Summary: Utility programs that use libgd
Group: Applications/Multimedia
@@ -47,31 +54,33 @@ graphics library for creating PNG and JPEG images.
%package devel
Summary: The development libraries and header files for gd
Group: Development/Libraries
-Requires: gd = %{version}-%{release}
-Requires: libX11-devel, libXpm-devel, libjpeg-devel, freetype-devel
-Requires: libpng-devel, zlib-devel, fontconfig-devel
-Requires: pkgconfig
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: freetype-devel%{?_isa}
+Requires: fontconfig-devel%{?_isa}
+Requires: libjpeg-devel%{?_isa}
+Requires: libpng-devel%{?_isa}
+Requires: libtiff-devel%{?_isa}
+Requires: libvpx-devel%{?_isa}
+Requires: libX11-devel%{?_isa}
+Requires: libXpm-devel%{?_isa}
+Requires: zlib-devel%{?_isa}
%description devel
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
-%patch3 -p1 -b .mlib
-%patch4 -p1 -b .loop
-%patch6 -p1 -b .overflow
-%patch5 -p1 -b .sparc64
-%patch7 -p1 -b .AALineThick
-%patch8 -p1 -b .bb
-%patch10 -p1 -b .time
-%patch11 -p1 -b .sec3
-%patch12 -p1 -b .runtests
-%patch13 -p1 -b .sa1
-%patch14 -p1 -b .sa2
-%patch15 -p1 -b .sa3
-%patch16 -p1 -b .sa4
-%patch17 -p1 -b .aarch64
+%setup -q -n libgd-%{version}%{?prever:-%{prever}}
+%patch1 -p1 -b .mlib
+
+# (re)generate autotool stuff
+if [ -f configure ]; then
+ autoreconf -fi
+else
+ ./bootstrap.sh
+fi
+
%build
# Provide a correct default font search path
@@ -82,33 +91,29 @@ CFLAGS="$RPM_OPT_FLAGS -DDEFAULT_FONTPATH='\"\
/usr/share/X11/fonts/Type1:\
/usr/share/fonts/liberation\"'"
-%configure --disable-rpath
+%configure \
+ --with-tiff=%{_prefix} \
+ --disable-rpath
make %{?_smp_mflags}
+
%install
make install INSTALL='install -p' DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.a
-# Using the last resort to remove rpath, another tricks didn't help
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/{pngtogd,gdparttopng,annotate,gdcmpgif,gdtopng,webpng,pngtogd2,gd2togif,gd2copypal,giftogd2,gd2topng}
%check
-pushd tests
-cmake -DBUILD_TEST=1 \
- -DGD_INCLUDE_DIR="`pwd`/.." \
- -DGD_LIBS_DIR="`pwd`/../.libs" \
- -DGD_SOURCE_DIR="`pwd`/.." .
-CPATH="`pwd`/gdtest" make
-make test
-popd
+make check
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+
%files
-%doc COPYING README-JPEG.TXT index.html NEWS
+%doc COPYING
%{_libdir}/*.so.*
%files progs
@@ -116,13 +121,17 @@ popd
%exclude %{_bindir}/gdlib-config
%files devel
-%doc index.html
+%doc ChangeLog
%{_bindir}/gdlib-config
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/gdlib.pc
+
%changelog
+* Tue Jun 11 2013 Remi Collet <rcollet at redhat.com> - 2.1.0-0.1.725ba9d
+- update to 2.1.0 (post RC2 git snapshot)
+
* Tue Apr 23 2013 Remi Collet <rcollet at redhat.com> - 2.0.35-25
- drop uneeded patch
- really set default font search path
diff --git a/sources b/sources
index ba0a3f1..d14fc85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c6c3dbb7bf079e0bb5fbbfd3bb8a71c gd-2.0.35.tar.bz2
+15e0f2eeb0fd2bc98d6794dc0ffe2d9a libgd-2.1.0-725ba9de4005144d137d2a7a70f760068fc3d306.tgz
More information about the scm-commits
mailing list