packages: librsvg/librsvg.spec - separate gtk+2/gtk+3-dependent parts; requ...

[qboosh]

Author: qboosh                       Date: Sat Apr 30 15:08:15 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- separate gtk+2/gtk+3-dependent parts; requiring two gtk+ versions to install the library was ridiculous

---- Files affected:
packages/librsvg:
   librsvg.spec (1.151 -> 1.152) 

---- Diffs:

================================================================
Index: packages/librsvg/librsvg.spec
diff -u packages/librsvg/librsvg.spec:1.151 packages/librsvg/librsvg.spec:1.152
--- packages/librsvg/librsvg.spec:1.151	Wed Apr  6 10:26:25 2011
+++ packages/librsvg/librsvg.spec	Sat Apr 30 17:08:10 2011
@@ -1,10 +1,5 @@
 # $Revision$, $Date$
 #
-# TODO:	- separate libs subpackage, current scheme conflicts on multilib
-# shouldn't be a problem:
-# - rsvg script doesn't differ
-# - rsvg-{convert,view} are ELF binaries with proper colors in rpm, so should be handled properly
-#
 # Conditional build
 %bcond_without	apidocs		# disable gtk-doc
 %bcond_without	gtk3		# disable gtk+3
@@ -43,11 +38,9 @@
 BuildRequires:	rpm-pythonprov
 BuildRequires:	sed >= 4.0
 Requires(post,postun):	/sbin/ldconfig
-Requires(post,postun):	gdk-pixbuf2
+Requires(post,postun):	gdk-pixbuf2 >= 2.0
 Requires:	gdk-pixbuf2 >= 2.0
 Requires:	glib2 >= 1:2.24.0
-Requires:	gtk+2 >= 2:2.16.0
-%{?with_gtk3:Requires:	gtk+3 >= 3.0.0}
 %{?with_libcroco:Requires:	libcroco >= 0.6.1}
 %{?with_libgsf:Requires:	libgsf >= 1.14.4}
 Requires:	libxml2 >= 1:2.6.31
@@ -56,7 +49,7 @@
 Obsoletes:	mozilla-plugin-rsvg
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# see gtk+2.spec for source of these ifdefs
+# see gdk-pixbuf2.spec for source of these ifdefs
 %if "%{_lib}" != "lib"
 %define         libext          %(lib="%{_lib}"; echo ${lib#lib})
 %define         pqext           -%{libext}
@@ -144,6 +137,33 @@
 %description apidocs -l pl.UTF-8
 Dokumentacja API biblioteki librsvg.
 
+%package gtk+2
+Summary:	librsvg/GTK+2 based SVG theme engine and viewer
+Summary(pl.UTF-8):	Silnik motywów oraz przeglądarka plików SVG oparte na bibliotekach librsvg/GTK+2
+Group:		X11/Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	gtk+2 >= 2:2.16.0
+
+%description gtk+2
+librsvg/GTK+2 based SVG theme engine and viewer.
+
+%description gtk+2 -l pl.UTF-8
+Silnik motywów oraz przeglądarka plików SVG oparte na bibliotekach
+librsvg/GTK+2.
+
+%package gtk+3
+Summary:	librsvg/GTK+3 based SVG theme and viewer
+Summary(pl.UTF-8):	Motyw i przeglądarka plików SVG oparte na bibliotekach librsvg/GTK+3
+Group:		X11/Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	gtk+3 >= 3.0.0
+
+%description gtk+3
+librsvg/GTK+3 based SVG theme and viewer.
+
+%description gtk+3 -l pl.UTF-8
+Motyw i przeglądarka plików SVG oparte na bibliotekach librsvg/GTK+3.
+
 %prep
 %setup -q
 
@@ -201,21 +221,18 @@
 %doc ChangeLog AUTHORS NEWS
 %attr(755,root,root) %{_bindir}/rsvg
 %attr(755,root,root) %{_bindir}/rsvg-convert
-%{?with_gtk3:%attr(755,root,root) %{_bindir}/rsvg-view-3}
-%attr(755,root,root) %{_bindir}/rsvg-view
-%attr(755,root,root) %{_libdir}/gdk-pixbuf-2.0/2.*.*/loaders/libpixbufloader-svg.so
-%attr(755,root,root) %{_libdir}/gtk-2.0/2.*/engines/libsvg.so
 %attr(755,root,root) %{_libdir}/librsvg-2.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/librsvg-2.so.2
-%{_datadir}/themes/bubble
+%attr(755,root,root) %{_libdir}/gdk-pixbuf-2.0/2.*.*/loaders/libpixbufloader-svg.so
+%dir %{_datadir}/themes/bubble
 %{_mandir}/man1/rsvg.1*
 %{_pixmapsdir}/svg-viewer.svg
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/librsvg-2.so
-%{_pkgconfigdir}/librsvg-2.0.pc
 %{_includedir}/librsvg-2.0
+%{_pkgconfigdir}/librsvg-2.0.pc
 
 %if %{with static_libs}
 %files static
@@ -229,12 +246,28 @@
 %{_gtkdocdir}/%{name}
 %endif
 
+%files gtk+2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/rsvg-view
+%attr(755,root,root) %{_libdir}/gtk-2.0/2.*/engines/libsvg.so
+%{_datadir}/themes/bubble/gtk-2.0
+
+%if %{with gtk3}
+%files gtk+3
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/rsvg-view-3
+%{_datadir}/themes/bubble/gtk-3.0
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.152  2011/04/30 15:08:10  qboosh
+- separate gtk+2/gtk+3-dependent parts; requiring two gtk+ versions to install the library was ridiculous
+
 Revision 1.151  2011/04/06 08:26:25  jajcus
 - without gtk3 bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/librsvg/librsvg.spec?r1=1.151&r2=1.152&f=u