Changed bcond name (gnome -> gnome1)

[packages/gdk-pixbuf.git] / gdk-pixbuf.spec

diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec
index 3e5866969b3f723c439dd28704bcd57cc0fcb955..4f6b9a329e96d0cf88a24e8bd1caf64f8f831b69 100644 (file)
--- a/gdk-pixbuf.spec
+++ b/gdk-pixbuf.spec
@@ -1,34 +1,37 @@
-
 #
-# _without_gnome - without GNOME (build without libgnomecanvaspixbuf)
+# Conditional build:
+%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
 Summary(pt_BR):        Biblioteca GdkPixBuf para manipulação de imagens
+Summary(ko):   ±×³ð¿¡¼­ »ç¿ëµÇ´Â ±×¸² Àб⠶óÀ̺귯¸®
 Summary(ru):   âÉÂÌÉÏÔÅËÁ ÚÁÇÒÕÚËÉ ÉÚÏÂÒÁÖÅÎÉÊ É ÒÅÎÄÅÒÉÎÇÁ ÄÌÑ Gdk
 Summary(uk):   â¦Â̦ÏÔÅËÁ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÚÏÂÒÁÖÅÎØ ÔÁ ÒÅÎÄÅÒÉÎÇÕ ÄÌÑ Gdk
 Name:          gdk-pixbuf
-Version:       0.18.0
-Release:       1
+Version:       0.22.0
+Release:       8
 Epoch:         1
 License:       LGPL
 Group:         X11/Libraries
-Source0:       ftp://ftp.gnome.org/pub/GNOME/unstable/sources/gdk-pixbuf/%{name}-%{version}.tar.bz2
+Source0:       ftp://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/0.22/%{name}-%{version}.tar.bz2
+# 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)
 
-%define                _prefix         /usr/X11R6
+%define                _gtkdocdir      %{_defaultdocdir}/gtk-doc/html
 
 %description
 The GdkPixBuf library provides a number of features:
@@ -64,10 +67,13 @@ A biblioteca GdkPixBuf oferece:
 Summary:       Include files for the gdk-pixbuf
 Summary(pl):   Pliki nag³ówkowe dla gdk-pixbuf
 Summary(pt_BR):        Bibliotecas e arquivos cabeçalhos para desenvolvimento
+Summary(ko):   gdk-pixbuf ÀÀ¿ëÇÁ·Î±×·¥À» °³¹ßÇÒ¶§ »ç¿ëµÇ´Â ¶óÀ̺귯¸®¿Í Çì´õÆÄÀÏ
 Summary(ru):   óÒÅÄÓÔ×Á ÒÁÚÒÁÂÏÔËÉ ÄÌÑ ÐÒÏÇÒÁÍÍ Ó GdkPixBuf
 Summary(uk):   úÁÓÏÂÉ ÒÏÚÒÏÂËÉ ÄÌÑ ÐÒÏÇÒÁÍ Ú GdkPixBuf
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}
+Requires:      gtk+-devel
+Requires:      gtk-doc-common
 
 %description devel
 Include files for the gdk-pixbuf.
@@ -92,7 +98,7 @@ Summary(pt_BR):       Bibliotecas est
 Summary(ru):   óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍÍ Ó GdkPixBuf
 Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍ Ú GdkPixBuf
 Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{epoch}:%{version}
 
 %description static
 Static gdk-pixbuf libraries.
@@ -117,7 +123,7 @@ Summary(pl):        Cz
 Summary(ru):   âÉÂÌÉÏÔÅËÁ ÚÁÇÒÕÚËÉ ÉÚÏÂÒÁÖÅÎÉÊ É ÒÅÎÄÅÒÉÎÇÁ ÄÌÑ Gdk
 Summary(uk):   â¦Â̦ÏÔÅËÁ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÚÏÂÒÁÖÅÎØ ÔÁ ÒÅÎÄÅÒÉÎÇÕ ÄÌÑ Gdk
 Group:         X11/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}
 
 %description gnome
 GNOME part of gdk-pixbuf library.
@@ -137,8 +143,8 @@ Cz
 Summary:       GNOME part of gdk-pixbuf library - development files
 Summary(pl):   Czê¶æ gdk-pixbuf zwi±zana z GNOME - pliki dla programistów
 Group:         X11/Development/Libraries
-Requires:      %{name}-gnome = %{version}
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-gnome = %{epoch}:%{version}
+Requires:      %{name}-devel = %{epoch}:%{version}
 Requires:      gnome-libs-devel
 
 %description gnome-devel
@@ -151,7 +157,7 @@ Cz
 Summary:       GNOME part of gdk-pixbuf library - static version
 Summary(pl):   Czê¶æ gdk-pixbuf zwi±zana z GNOME - wersja statyczna
 Group:         X11/Development/Libraries
-Requires:      %{name}-gnome-devel = %{version}
+Requires:      %{name}-gnome-devel = %{epoch}:%{version}
 
 %description gnome-static
 GNOME part of gdk-pixbuf library - static version.
@@ -162,27 +168,35 @@ Cz
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-rm -f missing
-libtoolize --copy --force
-aclocal
+%{__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"
-%{__make} AS="%{__cc}"
+       --with-html-dir=%{_gtkdocdir} \
+       %{!?with_gnome1:--without-gnome}
+
+%{__make} \
+       AS="%{__cc}"
 
 %install
 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}
+
+# no *.{a,la} for plugins - shut up check-files
+rm -f $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf/loaders/lib*.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,18 +220,20 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gdk-pixbuf-config
 %attr(755,root,root) %{_libdir}/gdk*.sh
 %attr(755,root,root) %{_libdir}/libgdk*.so
-%attr(755,root,root) %{_libdir}/libgdk*.la
+%{_libdir}/libgdk*.la
 %dir %{_includedir}/gdk-pixbuf-1.0
 %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)
 %{_libdir}/libgdk*.a
-%{_libdir}/gdk-pixbuf/loaders/lib*.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.*.*
@@ -226,8 +242,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gnome*.sh
 %attr(755,root,root) %{_libdir}/libgnome*.so
-%attr(755,root,root) %{_libdir}/libgnome*.la
+%{_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)