From dad7d5216a1eebb54c10995dc102b35cb3ec5e0a98e9ec438979b157ee7533e1 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Tue, 22 Oct 2013 04:47:32 +0000 Subject: [PATCH] - enable documentation - use gnome-common's version to wise detect Tumbleweed OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo?expand=0&rev=13 --- nemo-2.0.1-view-no-return.patch | 26 ++++++++++++++++++++++++++ nemo.changes | 2 ++ nemo.spec | 14 +++++++++----- 3 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 nemo-2.0.1-view-no-return.patch diff --git a/nemo-2.0.1-view-no-return.patch b/nemo-2.0.1-view-no-return.patch new file mode 100644 index 0000000..563c808 --- /dev/null +++ b/nemo-2.0.1-view-no-return.patch @@ -0,0 +1,26 @@ +Index: nemo-2.0.1/src/nemo-view.c +=================================================================== +--- nemo-2.0.1.orig/src/nemo-view.c ++++ nemo-2.0.1/src/nemo-view.c +@@ -700,6 +700,7 @@ nemo_view_get_default_zoom_level (NemoVi + } + + NEMO_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_default_zoom_level (view); ++ return 0; + } + + const char * +Index: nemo-2.0.1/src/nemo-window-menus.c +=================================================================== +--- nemo-2.0.1.orig/src/nemo-window-menus.c ++++ nemo-2.0.1/src/nemo-window-menus.c +@@ -300,7 +300,8 @@ action_about_nemo_callback (GtkAction *a + "along with Nemo; if not, write to the Free Software Foundation, Inc., " + "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA") + }; +- gchar *license_trans, *copyright_str; ++ gchar *license_trans; ++ gchar *copyright_str; + GDateTime *date; + + license_trans = g_strjoin ("\n\n", _(license[0]), _(license[1]), diff --git a/nemo.changes b/nemo.changes index a61679a..f0e735d 100644 --- a/nemo.changes +++ b/nemo.changes @@ -3,7 +3,9 @@ Mon Oct 21 17:44:21 UTC 2013 - i@marguerite.su - update version 2.0.1 * see https://github.com/linuxmint/nemo/commits/master +- enable documentation - remove lang_package, now cinnamon has a package called translation +- use gnome-common's version to wise detect Tumbleweed - add patch: nemo-2.0.1-g_list_copy_deep.patch, fix g_list_copy_deep ------------------------------------------------------------------- diff --git a/nemo.spec b/nemo.spec index 8b3e9cc..02d4997 100644 --- a/nemo.spec +++ b/nemo.spec @@ -16,6 +16,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# wise detect Tumbleweed +%{!?gnome_common_ver %global gnome_common_ver %(gnome-doc-common --version | sed -ne 's/.* \([0-9.]*\).*/\1/p')} Name: nemo Version: 2.0.1 @@ -26,7 +28,9 @@ Url: http://github.com/linuxmint/nemo Group: System/GUI/Other Source: %{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE fix upstream g_list_copy_deep on 12.2 -Patch: nemo-2.0.1-g_list_copy_deep.patch +Patch0: nemo-2.0.1-g_list_copy_deep.patch +# PATCH-FIX-UPSTREAM marguerite@opensuse.org fix OBS gcc checks +Patch1: nemo-2.0.1-view-no-return.patch BuildRequires: gnome-common BuildRequires: gtk-doc BuildRequires: hicolor-icon-theme @@ -49,7 +53,8 @@ BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(libxml-2.0) -%if 0%{?suse_version} <= 1230 +# wise detect Tumbleweed +%if 0%{?gnome_common_ver} <= 3.6.0 BuildRequires: pkgconfig(tracker-sparql-0.14) %else BuildRequires: pkgconfig(tracker-sparql-0.16) @@ -93,9 +98,8 @@ This package provides the GObject Introspection bindings for Nemo. %prep %setup -q -%if 0%{?suse_version} == 1220 -patch -p1 -%endif +%patch0 -p1 +%patch1 -p1 %build NOCONFIGURE=1 ./autogen.sh