From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 19 Oct 2001 22:28:34 +0000 (+0000)
Subject: - updated am patch for automake 1.5
X-Git-Tag: gdk-pixbuf-0_11_0-10~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgdk-pixbuf.git;a=commitdiff_plain;h=0fd24fba46d54f7fe5ceb6238cb60df9e8c4db6c

- updated am patch for automake 1.5
- removed --enable-canvas-pixbuf from configure - not used in 0.11.0
- release 10

Changed files:
    gdk-pixbuf-am.patch -> 1.2
    gdk-pixbuf.spec -> 1.43
---

diff --git a/gdk-pixbuf-am.patch b/gdk-pixbuf-am.patch
index 61e0071..eb281ba 100644
--- a/gdk-pixbuf-am.patch
+++ b/gdk-pixbuf-am.patch
@@ -10,3 +10,13 @@ diff -urN gdk-pixbuf-0.11.0.org/gdk-pixbuf/Makefile.am gdk-pixbuf-0.11.0/gdk-pix
  libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la
  
  
+--- gdk-pixbuf-0.11.0/configure.in.orig	Thu Apr 26 21:46:16 2001
++++ gdk-pixbuf-0.11.0/configure.in	Fri Oct 19 22:38:48 2001
+@@ -25,6 +25,7 @@
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_PROG_CPP
++AM_PROG_AS
+ AC_PATH_XTRA
+ 
+ dnl  Initialize maintainer mode
diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec
index b709c44..ca51eef 100644
--- a/gdk-pixbuf.spec
+++ b/gdk-pixbuf.spec
@@ -5,7 +5,7 @@ Summary(pl):	Biblioteka 
 Summary(pt_BR):	Biblioteca GdkPixBuf para manipulação de imagens
 Name:		gdk-pixbuf
 Version:	0.11.0
-Release:	9
+Release:	10
 Epoch:		1
 License:	LGPL
 Group:		X11/Libraries
@@ -21,12 +21,12 @@ Patch0:		%{name}-am.patch
 URL:		http://www.gnome.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	libtool
 BuildRequires:	gtk+-devel
 %{!?_without_gnome:BuildRequires:	gnome-libs-devel}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libpng >= 1.0.8
-BuildRequires:	libtool
 BuildRequires:	libungif-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	gdk-pixbuf-gnome
@@ -68,7 +68,7 @@ Group(pt_BR):	X11/Desenvolvimento/Bibliotecas
 Group(ru):	X11/òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
 Group(uk):	X11/òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:	%{name} = %{version}
-Requires:	gnome-libs-devel
+%{!?_without_gnome:Requires:	gnome-libs-devel}
 
 %description devel
 Include files for the gdk-pixbuf.
@@ -108,16 +108,14 @@ Bibliotecas est
 %patch0 -p1
 
 %build
-rm missing
+rm -f missing
 libtoolize --copy --force
 aclocal
 autoconf
-rm -f missing
 automake -a -c
 %configure \
-	--enable-canvas-pixbuf \
 	--disable-gtk-doc
-%{__make}
+%{__make} AS="%{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT