Hello community, here is the log from the commit of package libbonobo for openSUSE:Factory checked in at Sun Dec 19 12:44:22 CET 2010. -------- --- GNOME/libbonobo/libbonobo.changes 2010-10-13 10:30:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/libbonobo/libbonobo.changes 2010-12-15 11:27:01.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Dec 15 11:23:41 CET 2010 - vuntz@opensuse.org + +- Rework the support for both libdir and libexecdir for .server + files on 64bit machines: + + Update bonobo-activation-config.patch to not add + /usr/local/lib64/bonobo/servers unconditionally. + + Add libbonobo-lib64.patch that we only apply if %_lib is lib64: + we change the configuration, the code, and the documentation to + support both libdir and libexecdir. + + Remove previous crude sed hacks that were trying to do this. + + Manually create %{_libexecdir}/bonobo/servers in %install for + 64bit machines. +- Do not pass --libexecdir=%{_prefix}/lib/bonobo to configure: we + don't need that. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libbonobo-lib64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libbonobo.spec ++++++ --- /var/tmp/diff_new_pack.aA4R6l/_old 2010-12-19 12:43:20.000000000 +0100 +++ /var/tmp/diff_new_pack.aA4R6l/_new 2010-12-19 12:43:20.000000000 +0100 @@ -31,7 +31,7 @@ BuildRequires: translation-update-upstream Summary: The Bonobo Component System for the GNOME 2.x Desktop Platform Version: 2.32.0 -Release: 1 +Release: 2 License: GPLv2+ ; LGPLv2.1+ # Obsolete for >=9.1: Obsoletes: bonobo-activation @@ -47,6 +47,8 @@ Url: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch2: bonobo-activation-config.patch +# PATCH-FIX-OPENSUSE libbonobo-lib64.patch vuntz@opensuse.org -- Handle libdir in addition to libexecdir on 64-bit machines for .server files +Patch3: libbonobo-lib64.patch # PATCH-FEATURE-OPENSUSE libbonobo-fate300461-server-gettext.patch fate300461 vuntz@novell.com -- Look for translation of .server files via gettext Patch4: libbonobo-fate300461-server-gettext.patch Recommends: %{name}-lang = %{version} @@ -91,16 +93,13 @@ %setup -q translation-update-upstream %patch2 -%patch4 -p1 %if "%{_lib}" == "lib64" -sed -i s:/lib/:/lib64/:g utils/bonobo-slay.in -sed '\:<item>/usr/local/lib/bonobo/servers</item>:i<item>/usr/local/lib64/bonobo/servers</item>' bonobo-activation-config.xml +%patch3 -p1 %endif +%patch4 -p1 %build -autoreconf -f -i %configure --with-pic\ - --libexecdir=%{_prefix}/lib/bonobo\ --disable-static make %{?jobs:-j%jobs} @@ -109,8 +108,12 @@ %if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif +find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print +%if "%{_lib}" == "lib64" +# we need to create the arch-independent directory for .servers file +install -d %{buildroot}%{_libexecdir}/bonobo/servers +%endif %find_lang libbonobo-2.0 -find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} + %fdupes $RPM_BUILD_ROOT %clean @@ -124,14 +127,15 @@ %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/* +%{_sbindir}/bonobo-activation-sysconf %{_libdir}/*.so.* -%{_libdir}/bonobo -%if "%{_libdir}" != "%{_prefix}/lib" -%{_prefix}/lib/bonobo +%{_libdir}/bonobo/ +%if "%{_libdir}" != "%{_libexecdir}" +%{_libexecdir}/bonobo/ %endif +%{_libexecdir}/bonobo-activation-server %{_libdir}/orbit-2.0/*.so %doc %{_mandir}/man?/*.* -%{_sbindir}/* %dir %{_sysconfdir}/bonobo-activation %config %{_sysconfdir}/bonobo-activation/bonobo-activation-config.xml ++++++ bonobo-activation-config.patch ++++++ --- /var/tmp/diff_new_pack.aA4R6l/_old 2010-12-19 12:43:20.000000000 +0100 +++ /var/tmp/diff_new_pack.aA4R6l/_new 2010-12-19 12:43:20.000000000 +0100 @@ -1,13 +1,14 @@ Include /usr/local directories to bonobo activation configuration. Note: Default directory is included by default as the last in the list. ================================================================================ ---- bonobo-activation-config.xml +Index: bonobo-activation-config.xml +=================================================================== +--- bonobo-activation-config.xml.orig +++ bonobo-activation-config.xml -@@ -3,6 +3,8 @@ +@@ -3,6 +3,7 @@ <oafconfig> <searchpath> -+ <item>/usr/local/lib64/bonobo/servers</item> + <item>/usr/local/lib/bonobo/servers</item> <!-- Examples: --> <!-- <item>/opt/gnome2/lib/bonobo/servers</item> --> ++++++ libbonobo-lib64.patch ++++++ Index: libbonobo-2.32.0/bonobo-activation-config.xml =================================================================== --- libbonobo-2.32.0.orig/bonobo-activation-config.xml +++ libbonobo-2.32.0/bonobo-activation-config.xml @@ -3,6 +3,7 @@ <oafconfig> <searchpath> + <item>/usr/local/lib64/bonobo/servers</item> <item>/usr/local/lib/bonobo/servers</item> <!-- Examples: --> <!-- <item>/opt/gnome2/lib/bonobo/servers</item> --> Index: libbonobo-2.32.0/activation-server/Makefile.am =================================================================== --- libbonobo-2.32.0.orig/activation-server/Makefile.am +++ libbonobo-2.32.0/activation-server/Makefile.am @@ -12,7 +12,8 @@ INCLUDES= \ -I$(top_builddir)/bonobo-activation \ -I$(top_srcdir)/bonobo-activation \ -DPREFIX=\""$(prefix)"\" \ - -DSERVERINFODIR=\"$(libdir)/bonobo/servers\" \ + -DSERVERINFODIR=\"$(libexecdir)/bonobo/servers\" \ + -DSERVERINFO64DIR=\"$(libdir)/bonobo/servers\" \ -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \ $(SERVER_CFLAGS) \ $(WARN_CFLAGS) \ Index: libbonobo-2.32.0/activation-server/Makefile.in =================================================================== --- libbonobo-2.32.0.orig/activation-server/Makefile.in +++ libbonobo-2.32.0/activation-server/Makefile.in @@ -336,7 +336,8 @@ INCLUDES = \ -I$(top_builddir)/bonobo-activation \ -I$(top_srcdir)/bonobo-activation \ -DPREFIX=\""$(prefix)"\" \ - -DSERVERINFODIR=\"$(libdir)/bonobo/servers\" \ + -DSERVERINFODIR=\"$(libexecdir)/bonobo/servers\" \ + -DSERVERINFO64DIR=\"$(libdir)/bonobo/servers\" \ -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \ $(SERVER_CFLAGS) \ $(WARN_CFLAGS) \ Index: libbonobo-2.32.0/activation-server/activation-server-main.c =================================================================== --- libbonobo-2.32.0.orig/activation-server/activation-server-main.c +++ libbonobo-2.32.0/activation-server/activation-server-main.c @@ -239,6 +239,10 @@ build_src_dir (void) g_string_append (gnome_od_source_dir, gnome_dirs[i]); g_string_append (gnome_od_source_dir, + "/lib64/bonobo/servers" G_SEARCHPATH_SEPARATOR_S); + g_string_append (gnome_od_source_dir, + gnome_dirs[i]); + g_string_append (gnome_od_source_dir, "/lib/bonobo/servers" G_SEARCHPATH_SEPARATOR_S); } g_strfreev (gnome_dirs); @@ -248,6 +252,7 @@ build_src_dir (void) g_string_free (gnome_od_source_dir, TRUE); } + g_string_append (real_od_source_dir, SERVERINFO64DIR); g_string_append (real_od_source_dir, SERVERINFODIR); return real_od_source_dir; Index: libbonobo-2.32.0/activation-server/bonobo-activation-server.1 =================================================================== --- libbonobo-2.32.0.orig/activation-server/bonobo-activation-server.1 +++ libbonobo-2.32.0/activation-server/bonobo-activation-server.1 @@ -7,7 +7,7 @@ bonobo-activation-server \- GNOME compon This application tracks information about installed components and brokers components, in conjunction with its client library; libbonobo-activation. -It reads the component descriptions from ${prefix}/lib/bonobo/servers/*.server. +It reads the component descriptions from ${prefix}/lib64/bonobo/servers/*.server and ${prefix}/lib/bonobo/servers/*.server. These files provide an XML description of a components capabilities which can be queried and manipulated by clients from the client library. Index: libbonobo-2.32.0/utils/bonobo-slay.in =================================================================== --- libbonobo-2.32.0.orig/utils/bonobo-slay.in +++ libbonobo-2.32.0/utils/bonobo-slay.in @@ -64,13 +64,16 @@ chomp($username); # get Bonobo files # -@bonobo_dirs = ( "@prefix@/lib/bonobo/servers" ); +@bonobo_dirs = ( "@prefix@/lib64/bonobo/servers", "@prefix@/lib/bonobo/servers" ); foreach $dir (split(':', $ENV{'BONOBO_ACTIVATION_INFO_PATH'})) { if (-d $dir) { push @bonobo_dirs, $dir; } } foreach $dir (split(':', $ENV{'GNOME2_PATH'})) { + if (-d "$dir/lib64/bonobo/servers") { + push @bonobo_dirs, "$dir/lib64/bonobo/servers"; + } if (-d "$dir/lib/bonobo/servers") { push @bonobo_dirs, "$dir/lib/bonobo/servers"; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org