Author: sparky Date: Tue Feb 21 20:01:02 2006 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- added architecture-dependant config dir support, bconded, default off
(now I can use both 32 and 64 bit gtk on my amd64)
---- Files affected:
SPECS:
gtk+2.spec (1.200.2.3 -> 1.200.2.4)
---- Diffs:
================================================================
Index: SPECS/gtk+2.spec
diff -u SPECS/gtk+2.spec:1.200.2.3 SPECS/gtk+2.spec:1.200.2.4
--- SPECS/gtk+2.spec:1.200.2.3 Mon Feb 20 07:24:05 2006
+++ SPECS/gtk+2.spec Tue Feb 21 21:00:57 2006
@@ -4,6 +4,7 @@
%bcond_without apidocs # disable gtk-doc
%bcond_without static_libs # don't build static library
%bcond_with xlibs # use pkgconfig to find libX11
+%bcond_with arch_confdir # build with architecture-dependant config dir
#
Summary: The Gimp Toolkit
Summary(cs): Sada nástrojů pro Gimp
@@ -26,6 +27,7 @@
# from CVS, should disapear in the next version
Patch2: %{name}-pl.po.patch
Patch3: %{name}-tree_selection_emit_changed.patch
+Patch4: %{name}-arch_confdir.patch
URL: http://www.gtk.org/
%{!?with_xlibs:BuildRequires: X11-devel >= 1:6.8.0}
BuildRequires: atk-devel >= 1.8.0
@@ -62,6 +64,12 @@
Conflicts: libgdiplus < 1.1.9
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%if %{with arch_confdir}
+%define _confdir_suf -%{_target_cpu}
+%else
+%define _confdir_suf %{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
@@ -174,6 +182,7 @@
%{?with_xlibs:%patch1 -p1}
%patch2 -p1
%patch3 -p1
+%{?with_arch_confdir:%patch4 -p1}
%build
%{?with_apidocs:%{__gtkdocize}}
@@ -196,7 +205,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d
$RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{_sysconfdir}/gtk-2.0} \
+install -d
$RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{_sysconfdir}/gtk-2.0%{_confdir_suf}}
\
$RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.4.0/filesystems
%{__make} install \
@@ -204,8 +213,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}/gtk-2.0%{_confdir_suf}/gdk-pixbuf.loaders
+touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0%{_confdir_suf}/gtk.immodules
cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -229,23 +238,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
>%{_sysconfdir}/gtk-2.0%{_confdir_suf}/gdk-pixbuf.loaders
+%{_bindir}/gtk-query-immodules-2.0
>%{_sysconfdir}/gtk-2.0%{_confdir_suf}/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
>%{_sysconfdir}/gtk-2.0%{_confdir_suf}/gdk-pixbuf.loaders
+ %{_bindir}/gtk-query-immodules-2.0
>%{_sysconfdir}/gtk-2.0%{_confdir_suf}/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
>%{_sysconfdir}/gtk-2.0%{_confdir_suf}/gdk-pixbuf.loaders
+%{_bindir}/gtk-query-immodules-2.0
>%{_sysconfdir}/gtk-2.0%{_confdir_suf}/gtk.immodules
exit 0
%files -f %{name}.lang
@@ -312,6 +321,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.200.2.4 2006/02/21 20:00:57 sparky
+- added architecture-dependant config dir support, bconded, default off
+ (now I can use both 32 and 64 bit gtk on my amd64)
+
Revision 1.200.2.3 2006/02/20 06:24:05 charles
- added -tree_selection_emit_changed.patch (emit
tree_selection_signals[CHANGED]
from gtk_tree_view_set_model only if tree_view is realized). VMware works
again.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/gtk+2.spec?r1=1.200.2.3&r2=1.200.2.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
