SPECS (AC-branch): gtk+2.spec - simplified and sane arch confdir b...

[glen]

Author: glen                         Date: Wed Mar 19 15:03:01 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- simplified and sane arch confdir based on pango; rel 4

---- Files affected:
SPECS:
   gtk+2.spec (1.200.2.11 -> 1.200.2.12) 

---- Diffs:

================================================================
Index: SPECS/gtk+2.spec
diff -u SPECS/gtk+2.spec:1.200.2.11 SPECS/gtk+2.spec:1.200.2.12
--- SPECS/gtk+2.spec:1.200.2.11	Mon Oct 22 14:17:27 2007
+++ SPECS/gtk+2.spec	Wed Mar 19 16:02:56 2008
@@ -3,7 +3,6 @@
 # Conditional build:
 %bcond_without	apidocs		# disable gtk-doc
 %bcond_without	static_libs	# don't build static library
-%bcond_without	arch_confdir	# build with architecture-dependant config dir
 #
 Summary:	The Gimp Toolkit
 Summary(cs):	Sada nástrojù pro Gimp
@@ -15,7 +14,7 @@
 Summary(tr):	Gimp ToolKit arayüz kitaplýðý
 Name:		gtk+2
 Version:	2.8.20
-Release:	3
+Release:	4
 Epoch:		2
 License:	LGPL
 Group:		X11/Libraries
@@ -58,10 +57,13 @@
 Conflicts:	libgdiplus < 1.1.9
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%if %{with arch_confdir}
-%define	_confdir_suf	-%{_target_cpu}
+%if "%{_lib}" != "lib"
+%define		libext		%(lib="%{_lib}"; echo ${lib#lib})
+%define		_sysconfdir	/etc/gtk-2.0%{libext}
+%define		pqext		-%{libext}
 %else
-%define	_confdir_suf	%{nil}
+%define		_sysconfdir	/etc/gtk-2.0
+%define		pqext		%{nil}
 %endif
 
 %description
@@ -172,7 +174,7 @@
 %setup -q -n gtk+-%{version}
 %patch0 -p1
 %patch1 -p1
-%{?with_arch_confdir:%patch2 -p1}
+%patch2 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -195,7 +197,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{_sysconfdir}/gtk-2.0%{_confdir_suf}} \
+install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{_sysconfdir}} \
 	$RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.4.0/filesystems
 
 %{__make} install \
@@ -203,8 +205,8 @@
 	m4datadir=%{_aclocaldir} \
 	pkgconfigdir=%{_pkgconfigdir}
 
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0%{_confdir_suf}/gdk-pixbuf.loaders
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0%{_confdir_suf}/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}
 
@@ -213,6 +215,16 @@
 # shut up check-files (static modules and *.la for modules)
 rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-*/2.*/*/*.{a,la}
 
+%if "%{_lib}" != "lib"
+# We need to have 32-bit and 64-bit pango-querymodules 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}}
+# fix man page too
+#mv $RPM_BUILD_ROOT%{_mandir}/man1/pango-querymodules{,%{pqext}}.1
+%endif
+
 # for various GTK+2 modules
 install -d $(echo $RPM_BUILD_ROOT%{_libdir}/gtk-*)/modules
 # for GTK+2 theme engines
@@ -228,23 +240,23 @@
 %post
 /sbin/ldconfig
 umask 022
-%{_bindir}/gdk-pixbuf-query-loaders > %{_sysconfdir}/gtk-2.0%{_confdir_suf}/gdk-pixbuf.loaders
-%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0%{_confdir_suf}/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%{_confdir_suf}/gdk-pixbuf.loaders
-	%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0%{_confdir_suf}/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%{_confdir_suf}/gdk-pixbuf.loaders
-%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0%{_confdir_suf}/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
@@ -266,8 +278,8 @@
 %dir %{_libdir}/gtk-*/2.*/immodules
 %attr(755,root,root) %{_libdir}/gtk-*/2.*/immodules/*.so
 %{_datadir}/gtk-*
-%dir %{_sysconfdir}/gtk-*
-%ghost %{_sysconfdir}/gtk-*/*
+%dir %{_sysconfdir}
+%ghost %{_sysconfdir}/*
 %dir %{_datadir}/themes/Default/gtk-*
 %{_datadir}/themes/Default/gtk-*/gtkrc
 %dir %{_datadir}/themes/Emacs
@@ -311,6 +323,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.200.2.12  2008-03-19 15:02:56  glen
+- simplified and sane arch confdir based on pango; rel 4
+
 Revision 1.200.2.11  2007-10-22 12:17:27  glen
 - fix typo in postun; rel 3
 
================================================================

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