Fix FTBFS
This commit is contained in:
parent
1ed5f55666
commit
236d0d8a00
11
gd-fixautoconf.patch
Normal file
11
gd-fixautoconf.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- libgd-2.1.0/configure.ac.orig 2013-12-15 19:20:24.569994500 +0000
|
||||||
|
+++ libgd-2.1.0/configure.ac 2013-12-15 19:20:38.010142489 +0000
|
||||||
|
@@ -45,7 +45,7 @@
|
||||||
|
FEATURES="GD_GIF GD_GIFANIM GD_OPENPOLYGON"
|
||||||
|
AC_SUBST(FEATURES)
|
||||||
|
|
||||||
|
-AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-xz -Wall -Werror])
|
||||||
|
+AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-xz subdir-objects -Wall -Werror])
|
||||||
|
AC_CONFIG_HEADERS([src/config.h:src/config.hin])
|
||||||
|
|
||||||
|
dnl newer automake wants this, but we still want to work with older
|
10
gd.spec
10
gd.spec
@ -5,7 +5,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.1.0
|
Version: 2.1.0
|
||||||
Release: 3%{?prever}%{?short}%{?dist}
|
Release: 4%{?prever}%{?short}%{?dist}
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: http://libgd.bitbucket.org/
|
URL: http://libgd.bitbucket.org/
|
||||||
@ -17,6 +17,7 @@ Source0: libgd-%{version}-%{commit}.tgz
|
|||||||
Source0: https://bitbucket.org/libgd/gd-libgd/downloads/libgd-%{version}%{?prever:-%{prever}}.tar.xz
|
Source0: https://bitbucket.org/libgd/gd-libgd/downloads/libgd-%{version}%{?prever:-%{prever}}.tar.xz
|
||||||
%endif
|
%endif
|
||||||
Patch1: gd-2.1.0-multilib.patch
|
Patch1: gd-2.1.0-multilib.patch
|
||||||
|
Patch2: gd-fixautoconf.patch
|
||||||
|
|
||||||
BuildRequires: freetype-devel
|
BuildRequires: freetype-devel
|
||||||
BuildRequires: fontconfig-devel
|
BuildRequires: fontconfig-devel
|
||||||
@ -73,6 +74,7 @@ files for gd, a graphics library for creating PNG and JPEG graphics.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n libgd-%{version}%{?prever:-%{prever}}
|
%setup -q -n libgd-%{version}%{?prever:-%{prever}}
|
||||||
%patch1 -p1 -b .mlib
|
%patch1 -p1 -b .mlib
|
||||||
|
%patch2 -p1 -b .automake
|
||||||
|
|
||||||
# https://bitbucket.org/libgd/gd-libgd/issue/77
|
# https://bitbucket.org/libgd/gd-libgd/issue/77
|
||||||
sed -e '/GD_VERSION_STRING/s/-alpha//' \
|
sed -e '/GD_VERSION_STRING/s/-alpha//' \
|
||||||
@ -82,7 +84,8 @@ grep VERSION src/gd.h
|
|||||||
|
|
||||||
: regenerate autotool stuff
|
: regenerate autotool stuff
|
||||||
if [ -f configure ]; then
|
if [ -f configure ]; then
|
||||||
autoreconf -fi
|
libtoolize --copy --force
|
||||||
|
autoreconf -vif
|
||||||
else
|
else
|
||||||
./bootstrap.sh
|
./bootstrap.sh
|
||||||
fi
|
fi
|
||||||
@ -136,6 +139,9 @@ make check
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 23 2013 Peter Robinson <pbrobinson@fedoraproject.org> 2.1.0-4
|
||||||
|
- Fix FTBFS
|
||||||
|
|
||||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-3
|
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user