SPECS: gtk+2.spec - arch confdir /etc; rel 2

[glen]

Author: glen                         Date: Fri Mar 21 22:34:12 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- arch confdir /etc; rel 2

---- Files affected:
SPECS:
   gtk+2.spec (1.277 -> 1.278) 

---- Diffs:

================================================================
Index: SPECS/gtk+2.spec
diff -u SPECS/gtk+2.spec:1.277 SPECS/gtk+2.spec:1.278
--- SPECS/gtk+2.spec:1.277	Thu Mar 13 21:07:37 2008
+++ SPECS/gtk+2.spec	Fri Mar 21 23:34:07 2008
@@ -22,7 +22,7 @@
 Summary(tr.UTF-8):	Gimp ToolKit arayüz kitaplığı
 Name:		gtk+2
 Version:	2.12.9
-Release:	1
+Release:	2
 Epoch:		2
 License:	LGPL v2+
 Group:		X11/Libraries
@@ -36,6 +36,7 @@
 Patch4:		%{name}-firefox-printpreview.patch
 Patch5:		%{name}-workaround-flashproblem.patch
 Patch6:		%{name}-lt.patch
+Patch7:		%{name}-arch_confdir.patch
 URL:		http://www.gtk.org/
 BuildRequires:	atk-devel >= 1:1.22.0
 BuildRequires:	autoconf >= 2.54
@@ -85,6 +86,15 @@
 
 %define		abivers	2.10.0
 
+%if "%{_lib}" != "lib"
+%define		libext		%(lib="%{_lib}"; echo ${lib#lib})
+%define		_sysconfdir	/etc/gtk%{libext}-2.0
+%define		pqext		-%{libext}
+%else
+%define		_sysconfdir	/etc/gtk-2.0
+%define		pqext		%{nil}
+%endif
+
 %description
 GTK+, which stands for the Gimp ToolKit, is a library for creating
 graphical user interfaces for the X Window System. It is designed to
@@ -215,6 +225,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -246,8 +257,8 @@
 	m4datadir=%{_aclocaldir} \
 	pkgconfigdir=%{_pkgconfigdir}
 
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk.immodules
+touch $RPM_BUILD_ROOT%{_sysconfdir}/gdk-pixbuf.loaders
+touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk.immodules
 
 cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -256,6 +267,13 @@
 # shut up check-files (static modules and *.la for modules)
 rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{abivers}/*/*.{a,la}
 
+%if "%{_lib}" != "lib"
+# We need to have 32-bit and 64-bit binaries as they have hardcoded LIBDIR.
+# (needed when multilib is used)
+mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders{,%{pqext}}
+mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0{,%{pqext}}
+%endif
+
 # for various GTK+2 modules
 install -d $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules
 
@@ -272,23 +290,23 @@
 %post
 /sbin/ldconfig
 umask 022
-%{_bindir}/gdk-pixbuf-query-loaders > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
-%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules
+%{_bindir}/gdk-pixbuf-query-loaders%{pqext} > %{_sysconfdir}/gdk-pixbuf.loaders
+%{_bindir}/gtk-query-immodules-2.0%{pqext} > %{_sysconfdir}/gtk.immodules
 exit 0
 
 %postun
 /sbin/ldconfig
 if [ "$1" != "0" ]; then
 	umask 022
-	%{_bindir}/gdk-pixbuf-query-loaders > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
-	%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules
+	%{_bindir}/gdk-pixbuf-query-loaders%{pqext} > %{_sysconfdir}/gdk-pixbuf.loaders
+	%{_bindir}/gtk-query-immodules-2.0%{pqext} > %{_sysconfdir}/gtk.immodules
 fi
 exit 0
 
 %triggerpostun -- gtk+2 < 2:2.4.0
 umask 022
-%{_bindir}/gdk-pixbuf-query-loaders > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
-%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules
+%{_bindir}/gdk-pixbuf-query-loaders%{pqext} > %{_sysconfdir}/gdk-pixbuf.loaders
+%{_bindir}/gtk-query-immodules-2.0%{pqext} > %{_sysconfdir}/gtk.immodules
 exit 0
 
 %files -f %{name}.lang
@@ -324,10 +342,10 @@
 # XXX: just demo data - move to examples?
 %{_datadir}/gtk-2.0
 
-%dir %{_sysconfdir}/gtk-2.0
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gtk-2.0/im-multipress.conf
-%ghost %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
-%ghost %{_sysconfdir}/gtk-2.0/gtk.immodules
+%dir %{_sysconfdir}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/im-multipress.conf
+%ghost %{_sysconfdir}/gdk-pixbuf.loaders
+%ghost %{_sysconfdir}/gtk.immodules
 %dir %{_datadir}/themes/Default/gtk-*
 %{_datadir}/themes/Default/gtk-*/gtkrc
 %dir %{_datadir}/themes/Emacs
@@ -400,6 +418,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.278  2008-03-21 22:34:07  glen
+- arch confdir /etc; rel 2
+
 Revision 1.277  2008-03-13 20:07:37  qboosh
 - added lt patch (fixes build with libtool 2.2)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gtk+2.spec?r1=1.277&r2=1.278&f=u