- nognome patch - allow building without gnome even if gnome-config is present

- added gtk-doc files (with fixed location, not conflicting with gtk+2-devel)
- removed libpng 1.2.2 hack
- release 2

Changed files:
    gdk-pixbuf-nognome.patch -> 1.1
    gdk-pixbuf.spec -> 1.62

diff --git a/gdk-pixbuf-nognome.patch b/gdk-pixbuf-nognome.patch
new file mode 100644 (file)
index 0000000..1f98ee2
--- /dev/null
+++ b/gdk-pixbuf-nognome.patch
@@ -0,0 +1,23 @@
+--- gdk-pixbuf-0.19.0/configure.in.orig        Tue Sep 17 01:22:16 2002
++++ gdk-pixbuf-0.19.0/configure.in     Tue Sep 17 01:34:51 2002
+@@ -49,6 +49,12 @@
+ AC_SUBST(STRIP_BEGIN)
+ AC_SUBST(STRIP_END)
+ 
++AC_ARG_WITH(gnome, [  --without-gnome         Don not build GnomeCanvasPixbuf library],
++      [BUILD_CANVAS=$withval],
++      [BUILD_CANVAS=check]
++)
++
++if test "$BUILD_CANVAS" != "no" ; then
+ AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
+ if test x$GNOME_CONFIG != xno; then
+       echo "Building the GnomeCanvasPixbuf library"
+@@ -59,6 +65,7 @@
+       echo "Not building GnomeCanvasPixbuf library"
+       BUILD_CANVAS=no
+ fi       
++fi
+ 
+ AM_CONDITIONAL(BUILD_CANVAS_ITEM, test $BUILD_CANVAS = yes)
+ 

diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec
index 5cade2f678b52d02f311243f7ff2c36d51e6308c..e239b6bbde73996926350b7c7ed6070d1a84751f 100644 (file)
--- a/gdk-pixbuf.spec
+++ b/gdk-pixbuf.spec
@@ -1,8 +1,7 @@
-
 #
-# _without_gnome - without GNOME (build without libgnomecanvaspixbuf)
+# Conditional build:
+# _without_gnome - build without libgnomecanvaspixbuf (which requires GNOME)
 #
-
 Summary:       Image loading library used with GNOME
 Summary(pl):   Biblioteka ³aduj±ca obrazki u¿ywana w GNOME
 Summary(pt_BR):        Biblioteca GdkPixBuf para manipulação de imagens
@@ -10,12 +9,13 @@ Summary(ru): 
 Summary(uk):   â¦Â̦ÏÔÅËÁ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÚÏÂÒÁÖÅÎØ ÔÁ ÒÅÎÄÅÒÉÎÇÕ ÄÌÑ Gdk
 Name:          gdk-pixbuf
 Version:       0.19.0
-Release:       1
+Release:       2
 Epoch:         1
 License:       LGPL
 Group:         X11/Libraries
 Source0:       ftp://ftp.gnome.org/pub/GNOME/unstable/sources/gdk-pixbuf/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-am.patch
+Patch1:                %{name}-nognome.patch
 URL:           http://www.gnome.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -29,6 +29,7 @@ BuildRequires:        libungif-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
+%define                _gtkdocdir      %{_defaultdocdir}/gtk-doc/html
 
 %description
 The GdkPixBuf library provides a number of features:
@@ -68,6 +69,7 @@ Summary(ru):  
 Summary(uk):   úÁÓÏÂÉ ÒÏÚÒÏÂËÉ ÄÌÑ ÐÒÏÇÒÁÍ Ú GdkPixBuf
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}
+Requires:      gtk-doc-common
 
 %description devel
 Include files for the gdk-pixbuf.
@@ -162,19 +164,18 @@ Cz
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 rm -f missing
 %{__libtoolize}
 aclocal
 %{__autoconf}
-%{__automake} -a -c
-if [ -f %{_pkgconfigdir}/libpng12.pc ] ; then
-       CPPFLAGS="`pkg-config libpng12 --cflags`"
-fi
+%{__automake}
 %configure \
        --disable-gtk-doc \
-       CPPFLAGS="$CPPFLAGS"
+       --with-html-dir=%{_gtkdocdir} \
+       %{?_without_gnome:--without-gnome}
 %{__make} AS="%{__cc}"
 
 %install
@@ -182,7 +183,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       m4datadir=%{_aclocaldir}
+       m4datadir=%{_aclocaldir} \
+       HTML_DIR=%{_gtkdocdir}
+
+# resolve conflict with gtk+2-devel
+mv -f $RPM_BUILD_ROOT%{_gtkdocdir}/gdk-pixbuf{,-1.0}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -211,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/gdk-pixbuf-1.0/gdk-pixbuf
 %{_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]*
 
 %files static
 %defattr(644,root,root,755)
@@ -228,6 +236,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libgnome*.so
 %attr(755,root,root) %{_libdir}/libgnome*.la
 %{_includedir}/gdk-pixbuf-1.0/gdk-pixbuf/gnome*.h
+%{_gtkdocdir}/gdk-pixbuf-1.0/gnome*
 
 %files gnome-static
 %defattr(644,root,root,755)