From 257f0c930a10030b832e47f0b6b171ceab55784e7706cdaf8fd7da646bca427e Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 15 Feb 2012 15:14:49 +0000
Subject: [PATCH] Accepting request 104268 from devel:libraries:c_c++

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/104268
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gd?expand=0&rev=24
---
 gd.changes |  8 ++++++++
 gd.spec    | 33 ++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/gd.changes b/gd.changes
index c6f7253..ec217d0 100644
--- a/gd.changes
+++ b/gd.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Feb  5 16:31:39 UTC 2012 - jengelh@medozas.de
+
+- Remove redundant tags/sections
+- Parallel build with %_smp_mflags
+- Remove pointless INSTALL file from rpm package
+  (it's just the default autotools INSTALL blurb)
+
 -------------------------------------------------------------------
 Wed Oct  5 12:05:47 UTC 2011 - uli@suse.com
 
diff --git a/gd.spec b/gd.spec
index c8cc70b..a480dd0 100644
--- a/gd.spec
+++ b/gd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gd
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,21 +15,24 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
-
 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
+BuildRequires:  freetype2-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
 BuildRequires:  libtool
-License:        MIT
-Group:          System/Libraries
+BuildRequires:  xorg-x11-libX11-devel
+BuildRequires:  xorg-x11-libXau-devel
+BuildRequires:  xorg-x11-libXdmcp-devel
+BuildRequires:  xorg-x11-libXpm-devel
 Provides:       gdlib
 Obsoletes:      gdlib 
-AutoReqProv:    on
 Version:        2.0.36.RC1
-Release:        65
+Release:        0
 Url:            http://www.libgd.org/
 Summary:        A Drawing Library for Programs That Use PNG and JPEG Output
+License:        MIT
+Group:          System/Libraries
 Source:         gd-%{version}.tar.bz2
 Source1:        baselibs.conf
 Patch0:         gd-2.0.36RC1-warn.patch
@@ -56,7 +59,6 @@ Authors:
 
 %package devel
 Requires:       %{name} = %{version} glibc-devel
-License:        MIT
 Summary:        Drawing Library for Programs with PNG and JPEG Output
 Group:          Development/Libraries/C and C++
 Requires:       zlib-devel libpng-devel
@@ -86,16 +88,16 @@ Authors:
 
 %build
 autoreconf -fiv
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="%optflags"
 export CPPFLAGS="%{optflags}" 
 %configure \
 	--with-freetype \
 	--with-jpeg \
-	--with-png=%{?_sysroot}/usr \
+	--with-png=%{?_sysroot}/%_prefix \
 	--with-xpm \
 	--disable-static \
 	--with-pic
-%{__make} %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %check
 export MALLOC_CHECK_=2 MALLOC_PERTURB_=$((${RANDOM:-256} % 256))
@@ -117,16 +119,13 @@ unset MALLOC_CHECK_ MALLOC_PERTURB_
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%doc COPYING INSTALL README* index.html
+%doc COPYING README* index.html
 /usr/bin/annotate
 /usr/bin/bdftogd
 /usr/bin/gd2copypal