Hello community, here is the log from the commit of package gnome-commander for openSUSE:Factory checked in at 2013-03-21 22:02:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-commander (Old) and /work/SRC/openSUSE:Factory/.gnome-commander.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-commander", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-commander/gnome-commander.changes 2012-05-25 16:15:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-commander.new/gnome-commander.changes 2013-03-21 22:02:49.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Mar 20 21:07:40 UTC 2013 - [email protected] + +- Add gnome-commander-libgsf.patch: Fix build with libgsf 1.14.26. +- Add gnome-commander-glib236.patch: Fix build with glib 2.36. +- Drop xz BuildRequires, as it now comes for free in the build + system. + +------------------------------------------------------------------- New: ---- gnome-commander-glib236.patch gnome-commander-libgsf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-commander.spec ++++++ --- /var/tmp/diff_new_pack.lD2fIX/_old 2013-03-21 22:02:50.000000000 +0100 +++ /var/tmp/diff_new_pack.lD2fIX/_new 2013-03-21 22:02:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-commander # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,10 @@ Patch0: gnome-commander-gcc47.patch # PATCH-FIX-UPSTREAM gnome-commander-poppler020.patch bgo#676303 [email protected] -- Fix build with poppler 0.20. Patch1: gnome-commander-poppler020.patch +# PATCH-FIX-UPSTREAM gnome-commander-libgsf.patch bgo#696227 [email protected] -- Fix build with libgsf 1.14.26. +Patch2: gnome-commander-libgsf.patch +# PATCH-FIX-UPSTREAM gnome-commander-glib236.patch [email protected] -- Fix build with glib 2.36, patch inspired by git. +Patch3: gnome-commander-glib236.patch BuildRequires: chmlib-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -44,8 +48,6 @@ BuildRequires: taglib-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz Recommends: %{name}-lang # For xdg-su Recommends: xdg-utils @@ -61,6 +63,8 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 translation-update-upstream %build ++++++ gnome-commander-glib236.patch ++++++ Index: gnome-commander-1.2.8.15/src/gnome-cmd-user-actions.cc =================================================================== --- gnome-commander-1.2.8.15.orig/src/gnome-cmd-user-actions.cc +++ gnome-commander-1.2.8.15/src/gnome-cmd-user-actions.cc @@ -1130,7 +1130,7 @@ void command_root_mode (GtkMenuItem *men argv[i++] = su; if (need_c) argv[i++] = "-c"; - argv[i++] = g_get_prgname (); + argv[i++] = g_strdup (g_get_prgname ()); argv[i++] = NULL; GError *error = NULL; ++++++ gnome-commander-libgsf.patch ++++++ diff --git a/configure.in b/configure.in index fbb645c..43fd4fd 100644 --- a/configure.in +++ b/configure.in @@ -247,6 +247,11 @@ if test x$with_libgsf != xno; then PKG_CHECK_MODULES(GSF, libgsf-1 >= $LIBGSF_REQ, have_gsf=yes, have_gsf=no) fi if test "x$have_gsf" = "xyes"; then + PKG_CHECK_MODULES(GSF_1_14_26, libgsf-1 >= 1.14.26, + AC_DEFINE(HAVE_GSF_1_14_26,1,[Define to 1 if you have libgsf >= 1.14.26]), + have_gsf_1_14_26=no) +fi +if test "x$have_gsf" = "xyes"; then AC_DEFINE(HAVE_GSF, 1, [Define to 1 if you have libgsf (OLE and ODF) support]) fi diff --git a/src/tags/gnome-cmd-tags-doc.cc b/src/tags/gnome-cmd-tags-doc.cc index a666c19..4bb693a 100644 --- a/src/tags/gnome-cmd-tags-doc.cc +++ b/src/tags/gnome-cmd-tags-doc.cc @@ -38,7 +38,9 @@ #include "utils.h" #include "dict.h" -#ifdef HAVE_GSF +#ifdef HAVE_GSF_1_14_26 +#include <gsf/gsf.h> +#elif HAVE_GSF #include <gsf/gsf-infile.h> #include <gsf/gsf-infile-msole.h> #include <gsf/gsf-infile-zip.h> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
