SPECS (AC-branch): librsvg.spec - arch confdir gtk+2; rel 4

[glen]

Author: glen                         Date: Wed Mar 19 16:46:21 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- arch confdir gtk+2; rel 4

---- Files affected:
SPECS:
   librsvg.spec (1.98.2.5 -> 1.98.2.6) 

---- Diffs:

================================================================
Index: SPECS/librsvg.spec
diff -u SPECS/librsvg.spec:1.98.2.5 SPECS/librsvg.spec:1.98.2.6
--- SPECS/librsvg.spec:1.98.2.5	Sun Apr  1 20:37:48 2007
+++ SPECS/librsvg.spec	Wed Mar 19 17:46:16 2008
@@ -14,11 +14,11 @@
 Summary(uk):	SVG ¦Â̦ÏÔÅËÁ
 Name:		librsvg
 Version:	2.14.3
-Release:	3
+Release:	4
 Epoch:		1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/librsvg/2.14/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.14/%{name}-%{version}.tar.bz2
 # Source0-md5:	f926aa102ccc3ce99ddf257fcce8ebf4
 URL:		http://librsvg.sourceforge.net/
 Patch0:		%{name}-xulrunner.patch
@@ -44,7 +44,7 @@
 %{!?with_gnomeprint:BuildConflicts:	libgnomeprintui-devel}
 Requires(post,postun):	gtk+2
 Requires:	cairo >= 1.0.2
-Requires:	gtk+2 >= 2:2.8.6
+Requires:	gtk+2 >= 2:2.8.20-3.2
 %{?with_libcroco:Requires:	libcroco >= 0.6.1}
 %{?with_libgsf:Requires:	libgsf >= 1.13.2}
 Requires:	libxml2 >= 1:2.6.22
@@ -84,6 +84,15 @@
 Requires:	libxml2-devel >= 2.6.22
 Obsoletes:	librsvg0-devel
 
+%if "%{_lib}" != "lib"
+%define		libext		%(lib="%{_lib}"; echo ${lib#lib})
+%define		pqext		-%{libext}
+%define		_gtkconfdir	/etc/gtk%{libext}-2.0
+%else
+%define		_gtkconfdir	/etc/gtk-2.0
+%define		pqext		%{nil}
+%endif
+
 %description devel
 This package provides the necessary development libraries and include
 files to allow you to develop with librsvg.
@@ -175,12 +184,12 @@
 %post
 /sbin/ldconfig
 umask 022
-gdk-pixbuf-query-loaders > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
+gdk-pixbuf-query-loaders%{pqext} > %{_gtkconfdir}/gdk-pixbuf.loaders
 
 %postun
 /sbin/ldconfig
 umask 022
-gdk-pixbuf-query-loaders > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
+gdk-pixbuf-query-loaders%{pqext} > %{_gtkconfdir}/gdk-pixbuf.loaders
 
 %post -n browser-plugin-%{name}
 %update_browser_plugins
@@ -226,6 +235,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.98.2.6  2008-03-19 16:46:16  glen
+- arch confdir gtk+2; rel 4
+
 Revision 1.98.2.5  2007-04-01 18:37:48  glen
 - browser plugins v2
 - build with xulrunner
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/librsvg.spec?r1=1.98.2.5&r2=1.98.2.6&f=u