SHA256
1
0
forked from pool/nemo

- 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
This commit is contained in:
Marguerite Su 2013-10-22 04:47:32 +00:00 committed by Git OBS Bridge
parent 790f16f17e
commit dad7d5216a
3 changed files with 37 additions and 5 deletions

View File

@ -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]),

View File

@ -3,7 +3,9 @@ Mon Oct 21 17:44:21 UTC 2013 - i@marguerite.su
- update version 2.0.1 - update version 2.0.1
* see https://github.com/linuxmint/nemo/commits/master * see https://github.com/linuxmint/nemo/commits/master
- enable documentation
- remove lang_package, now cinnamon has a package called translation - 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 - add patch: nemo-2.0.1-g_list_copy_deep.patch, fix g_list_copy_deep
------------------------------------------------------------------- -------------------------------------------------------------------

View File

@ -16,6 +16,8 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # 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 Name: nemo
Version: 2.0.1 Version: 2.0.1
@ -26,7 +28,9 @@ Url: http://github.com/linuxmint/nemo
Group: System/GUI/Other Group: System/GUI/Other
Source: %{name}-%{version}.tar.gz Source: %{name}-%{version}.tar.gz
# PATCH-FIX-OPENSUSE fix upstream g_list_copy_deep on 12.2 # 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: gnome-common
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
@ -49,7 +53,8 @@ BuildRequires: pkgconfig(libexif)
BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(libselinux)
BuildRequires: pkgconfig(libxml-2.0) 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) BuildRequires: pkgconfig(tracker-sparql-0.14)
%else %else
BuildRequires: pkgconfig(tracker-sparql-0.16) BuildRequires: pkgconfig(tracker-sparql-0.16)
@ -93,9 +98,8 @@ This package provides the GObject Introspection bindings for Nemo.
%prep %prep
%setup -q %setup -q
%if 0%{?suse_version} == 1220 %patch0 -p1
patch -p1 %patch1 -p1
%endif
%build %build
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh