X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gdk-pixbuf.spec;h=4f6b9a329e96d0cf88a24e8bd1caf64f8f831b69;hb=6076b49d5a283e21a82fda2be4bfa5aefc192e0b;hp=36574246cd6dd4f5ec38bcf146358e0d2537ef29;hpb=0ba9ce223d3d1dd8b3f8d2c09c18a512acc62db7;p=packages%2Fgdk-pixbuf.git

diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec
index 3657424..4f6b9a3 100644
--- a/gdk-pixbuf.spec
+++ b/gdk-pixbuf.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-# _without_gnome - build without libgnomecanvaspixbuf (which requires GNOME)
+%bcond_without	gnome1	# build without libgnomecanvaspixbuf (which requires GNOME)
 #
 Summary:	Image loading library used with GNOME
 Summary(pl):	Biblioteka ³aduj±ca obrazki u¿ywana w GNOME
@@ -10,7 +10,7 @@ Summary(ru):	
 Summary(uk):	â¦Â̦ÏÔÅËÁ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÚÏÂÒÁÖÅÎØ ÔÁ ÒÅÎÄÅÒÉÎÇÕ ÄÌÑ Gdk
 Name:		gdk-pixbuf
 Version:	0.22.0
-Release:	4
+Release:	8
 Epoch:		1
 License:	LGPL
 Group:		X11/Libraries
@@ -18,15 +18,16 @@ Source0:	ftp://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/0.22/%{name}-%{version
 # Source0-md5: 05fcb68ceaa338614ab650c775efc2f2
 Patch0:		%{name}-am.patch
 Patch1:		%{name}-nognome.patch
+Patch2:		%{name}-am18.patch
 URL:		http://www.gnome.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	libtool
 BuildRequires:	gtk+-devel
-%{!?_without_gnome:BuildRequires:	gnome-libs-devel}
+%{?with_gnome1:BuildRequires:	gnome-libs-devel}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libtiff-devel
-BuildRequires:	libpng >= 1.0.8
+BuildRequires:	libtool
+BuildRequires:	libpng-devel >= 1.0.8
 BuildRequires:	libungif-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -71,6 +72,7 @@ Summary(ru):	
 Summary(uk):	úÁÓÏÂÉ ÒÏÚÒÏÂËÉ ÄÌÑ ÐÒÏÇÒÁÍ Ú GdkPixBuf
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}
+Requires:	gtk+-devel
 Requires:	gtk-doc-common
 
 %description devel
@@ -167,9 +169,9 @@ Cz
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -177,8 +179,10 @@ rm -f missing
 %configure \
 	--disable-gtk-doc \
 	--with-html-dir=%{_gtkdocdir} \
-	%{?_without_gnome:--without-gnome}
-%{__make} AS="%{__cc}"
+	%{!?with_gnome1:--without-gnome}
+
+%{__make} \
+	AS="%{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -222,14 +226,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gdk-pixbuf-1.0/gdk-pixbuf/gdk*.h
 %{_aclocaldir}/*
 %dir %{_gtkdocdir}/gdk-pixbuf-1.0
-%{_gtkdocdir}/gdk-pixbuf-1.0/[^g]*
-%{_gtkdocdir}/gdk-pixbuf-1.0/g[^n]*
+%{_gtkdocdir}/gdk-pixbuf-1.0/[!g]*
+%{_gtkdocdir}/gdk-pixbuf-1.0/g[!n]*
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libgdk*.a
 
-%if %{?_without_gnome:0}%{!?_without_gnome:1}
+%if %{with gnome1}
 %files gnome
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgnome*.so.*.*