Accepting request 212327 from graphics

- Cleanup here&there to parallelize everything
- Remove bogus cmake dependency (forwarded request 212320 from scarabeus_iv)

OBS-URL: https://build.opensuse.org/request/show/212327
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gd?expand=0&rev=30
This commit is contained in:
Stephan Kulow 2013-12-30 08:52:08 +00:00 committed by Git OBS Bridge
commit 861cfe52d4
2 changed files with 41 additions and 35 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Dec 27 07:42:11 UTC 2013 - tchvatal@suse.com
- Cleanup here&there to parallelize everything
- Remove bogus cmake dependency
-------------------------------------------------------------------
Tue Dec 17 14:30:38 UTC 2013 - pgajdos@suse.com

70
gd.spec
View File

@ -17,27 +17,13 @@
%define prjname libgd
Name: gd
BuildRequires: cmake
BuildRequires: fontconfig-devel
BuildRequires: freetype2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: xorg-x11-libX11-devel
BuildRequires: xorg-x11-libXau-devel
BuildRequires: xorg-x11-libXdmcp-devel
BuildRequires: xorg-x11-libXpm-devel
Provides: gdlib
Obsoletes: gdlib
Version: 2.1.0
Release: 0
Url: http://libgd.bitbucket.org/
Summary: A Drawing Library for Programs That Use PNG and JPEG Output
License: MIT
Group: System/Libraries
Url: http://libgd.bitbucket.org/
Source: https://bitbucket.org/libgd/gd-libgd/downloads/libgd-%{version}.tar.xz
Source1: baselibs.conf
# to be upstreamed, gdlib-config --libs to return the same as pkg-config --libs gdlib
@ -50,6 +36,18 @@ Patch2: gd-format.patch
Patch3: gd-aliasing.patch
# could be upstreamed?
Patch4: gd-autoconf.patch
BuildRequires: fontconfig-devel
BuildRequires: freetype2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: xorg-x11-libX11-devel
BuildRequires: xorg-x11-libXau-devel
BuildRequires: xorg-x11-libXdmcp-devel
BuildRequires: xorg-x11-libXpm-devel
Provides: gdlib = %{version}
Obsoletes: gdlib < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -59,10 +57,10 @@ and flood fills. It outputs PNG, JPEG, and WBMP (for wireless devices)
and is supported by PHP.
%package devel
Requires: %{name} = %{version}
Requires: glibc-devel
Summary: Drawing Library for Programs with PNG and JPEG Output
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: glibc-devel
Requires: libpng-devel
Requires: zlib-devel
@ -73,8 +71,6 @@ writes out the result as a PNG or JPEG file. This is particularly
useful in World Wide Web applications, where PNG and JPEG are two of
the formats accepted for inline images by most browsers.
%prep
%setup -q -n %{prjname}-%{version}
%patch0
@ -82,22 +78,27 @@ the formats accepted for inline images by most browsers.
%patch2
%patch3
%patch4
%build
autoreconf -fiv
# without-x -- useless switch which just mangles cflags
%configure \
--without-x \
--with-fontconfig \
--with-freetype \
--with-jpeg \
--with-png=%{?_sysroot}/%_prefix \
--with-png \
--with-xpm \
--disable-static \
--with-pic
make %{?_smp_mflags}
%check
make check
make check %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
make DESTDIR=%{buildroot} install %{?_smp_mflags}
find %{buildroot} -type f -name "*.la" -delete -print
%post -p /sbin/ldconfig
@ -106,18 +107,18 @@ make install DESTDIR=$RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc COPYING NEWS examples
/usr/bin/annotate
/usr/bin/bdftogd
/usr/bin/gd2copypal
/usr/bin/gd2togif
/usr/bin/gd2topng
/usr/bin/gdcmpgif
/usr/bin/gdparttopng
/usr/bin/gdtopng
/usr/bin/giftogd2
/usr/bin/pngtogd
/usr/bin/pngtogd2
/usr/bin/webpng
%{_bindir}/annotate
%{_bindir}/bdftogd
%{_bindir}/gd2copypal
%{_bindir}/gd2togif
%{_bindir}/gd2topng
%{_bindir}/gdcmpgif
%{_bindir}/gdparttopng
%{_bindir}/gdtopng
%{_bindir}/giftogd2
%{_bindir}/pngtogd
%{_bindir}/pngtogd2
%{_bindir}/webpng
%{_libdir}/*.so.*
%files devel
@ -126,6 +127,5 @@ make install DESTDIR=$RPM_BUILD_ROOT
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/gdlib.pc
%exclude %{_libdir}/*.la
%changelog