SPECS (AC-branch): gtk+2.spec - use /etc/gtk64-2.0 for lib64 arches

[glen]

Author: glen                         Date: Wed Mar 19 15:33:57 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use /etc/gtk64-2.0 for lib64 arches

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

---- Diffs:

================================================================
Index: SPECS/gtk+2.spec
diff -u SPECS/gtk+2.spec:1.200.2.12 SPECS/gtk+2.spec:1.200.2.13
--- SPECS/gtk+2.spec:1.200.2.12	Wed Mar 19 16:02:56 2008
+++ SPECS/gtk+2.spec	Wed Mar 19 16:33:52 2008
@@ -59,7 +59,7 @@
 
 %if "%{_lib}" != "lib"
 %define		libext		%(lib="%{_lib}"; echo ${lib#lib})
-%define		_sysconfdir	/etc/gtk-2.0%{libext}
+%define		_sysconfdir	/etc/gtk%{libext}-2.0
 %define		pqext		-%{libext}
 %else
 %define		_sysconfdir	/etc/gtk-2.0
@@ -216,13 +216,10 @@
 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.
+# 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}}
-# fix man page too
-#mv $RPM_BUILD_ROOT%{_mandir}/man1/pango-querymodules{,%{pqext}}.1
 %endif
 
 # for various GTK+2 modules
@@ -265,7 +262,7 @@
 %attr(755,root,root) %{_bindir}/gtk-demo
 %attr(755,root,root) %{_bindir}/gtk-query*
 %attr(755,root,root) %{_bindir}/gtk-update-icon-cache
-%attr(755,root,root) %{_bindir}/gdk-pixbuf-query-loaders
+%attr(755,root,root) %{_bindir}/gdk-pixbuf-query-loaders%{pqext}
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %dir %{_libdir}/gtk-*
 %dir %{_libdir}/gtk-*/modules
@@ -323,6 +320,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.200.2.13  2008-03-19 15:33:52  glen
+- use /etc/gtk64-2.0 for lib64 arches
+
 Revision 1.200.2.12  2008-03-19 15:02:56  glen
 - simplified and sane arch confdir based on pango; rel 4
 
================================================================

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