- dropped strange without_gimp on ppc (doesn't build with gimp on any arch now)

[packages/librsvg.git] / librsvg.spec

diff --git a/librsvg.spec b/librsvg.spec
index 084593e42917954bf46164a891a5eae62487613f..ecee617a90ca7dbbb7ea517c066229216a3ae833 100644 (file)
--- a/librsvg.spec
+++ b/librsvg.spec
@@ -1,46 +1,45 @@
 #
 # Conditional build
-# _without_gimp                - without gimp svg plugin
-# _without_libgsf      - without libgsf (used for run-time decompression)
+%bcond_with    gimp            # build gimp svg plugin (but gimp.spec provides better plugin)
+%bcond_without libgsf          # build without libgsf (used for run-time decompression)
+%bcond_with    libcroco        # build with CSS support through libcroco
 #
-%ifarch ppc
-%define        _without_gimp   1
-%endif
-
 Summary:       Raph's SVG library
 Summary(pl):   Biblioteka Raph's SVG
 Summary(pt_BR):        Biblioteca SVG
-Summary(uk):   SVG ¦Â̦ÏÔÅËÁ
+Summary(ru):   SVG ÂÉÂÌÉÏÔÅËÁ
 Summary(uk):   SVG ¦Â̦ÏÔÅËÁ
 Name:          librsvg
-Version:       2.3.1
-Release:       2
+Version:       2.4.0
+Release:       3
 License:       LGPL
 Vendor:                GNOME
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.3/%{name}-%{version}.tar.bz2
-# Source0-md5: ef9317a3df6d99a44ddf75e4fbcaab4a
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
+# Source0-md5: 1a073864e5f6e9793cf23e38dc723803
 Patch0:                %{name}-link.patch
-URL:           http://nautilus.eazel.com/
+URL:           http://librsvg.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: freetype-devel >= 2.0.1
-%{!?_without_gimp:BuildRequires: gimp-devel >= 1.3.17}
-BuildRequires: gtk+2-devel >= 2.2.0
-BuildRequires: libart_lgpl-devel >= 2.3.11
-# TODO: libcroco-devel >= 0.1.0 (optional)
-%{!?_without_libgsf:BuildRequires:     libgsf-devel >= 1.6.0}
+%{?with_gimp:BuildRequires:    gimp-devel >= 1.3.20}
+BuildRequires: gtk+2-devel >= 2.2.3
+BuildRequires: libart_lgpl-devel >= 2.3.15
+%{?with_libcroco:BuildRequires:        libcroco-devel >= 0.1.0}
+%{?with_libgsf:BuildRequires:  libgsf-devel >= 1.6.0}
 BuildRequires: libpng-devel
 BuildRequires: libtool
-BuildRequires: libxml2-devel >= 2.5.1
+BuildRequires: libxml2-devel >= 2.5.10
 BuildRequires: popt-devel >= 1.5
-Requires:      gtk+2 >= 2.2.0
+Requires(post,postun): /sbin/ldconfig
+Requires(post,postun): gtk+2
+Requires:      gtk+2 >= 2.2.3
 Requires:      popt >= 1.5
 Obsoletes:     librsvg0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%if 0%{!?_without_gimp:1}
-%define                gimpplugindir   %(gimptool-1.3 --gimpplugindir)/plug-ins
+%if %{with gimp}
+%define                gimpplugindir   %(gimptool --gimpplugindir)/plug-ins
 %endif
 
 %description
@@ -66,16 +65,17 @@ Summary(ru):        
 Summary(uk):   â¦Â̦ÏÔÅÞΦ ̦ÎËÉ ÔÁ ÆÁÊÌÉ ÚÁÇÏÌÏ×Ë¦× ÄÌÑ ÒÏÚÒÏÂËÉ Ú librsvg
 Group:         Development/Libraries
 Requires:      %{name} = %{version}
-Requires:      gtk+2-devel >= 2.2.0
-Requires:      libart_lgpl-devel >= 2.3.11
-%{!?_without_libgsf:Requires:  libgsf-devel >= 1.6.0}
-Requires:      libxml2-devel >= 2.5.1
+Requires:      gtk+2-devel >= 2.2.3
+Requires:      libart_lgpl-devel >= 2.3.15
+%{?with_libcroco:Requires:     libcroco-devel >= 0.1.0}
+%{?with_libgsf:Requires:       libgsf-devel >= 1.6.0}
+Requires:      libxml2-devel >= 2.5.10
 Obsoletes:     librsvg0-devel
 
 %description devel
 This package provides the necessary development libraries and include
 files to allow you to develop with librsvg.
- 
+
 %description devel -l pl
 Pakiet zawiera pliki nag³ówkowe potrzebne do tworzenia oprogramowania
 z wykorzystaniem librsvg.
@@ -133,8 +133,9 @@ Wtyczka SVG dla Gimpa.
 %{__autoconf}
 %{__automake}
 %configure \
-       %{?_without_gimp:--without-gimp} \
-       %{?_without_libgsf:--without-svgz}
+       %{!?with_libcroco:--without-croco} \
+       %{!?with_gimp:--without-gimp} \
+       %{!?with_libgsf:--without-svgz}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -149,8 +150,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.*/{engines,loaders}/*.{la,a}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+umask 022
+gdk-pixbuf-query-loaders > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
+
+%postun
+/sbin/ldconfig
+umask 022
+gdk-pixbuf-query-loaders > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
 
 %files
 %defattr(644,root,root,755)
@@ -163,8 +171,8 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %doc ChangeLog AUTHORS NEWS
-%{_libdir}/lib*.la
 %attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
 %{_pkgconfigdir}/*.pc
 %{_includedir}/librsvg-2
 %{_docdir}/%{name}
@@ -173,7 +181,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
-%if %{?_without_gimp:0}%{!?_without_gimp:1}
+%if %{with gimp}
 %files -n gimp-svg
 %defattr(644,root,root,755)
 %attr(755,root,root) %{gimpplugindir}/svg