From 7b97185f3aed5ad4360469ce0a69e74c33241d402ff21256a2199c2d2cd7d00b Mon Sep 17 00:00:00 2001 From: Magnus Boman Date: Sun, 2 May 2010 21:21:59 +0000 Subject: [PATCH 1/2] Accepting request 39131 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/file-roller via accept of submit request 39131 revision 2. Request was accepted with message: Ok OBS-URL: https://build.opensuse.org/request/show/39131 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=74 --- file-roller-2.30.0.tar.bz2 | 3 --- file-roller-2.30.1.1.tar.bz2 | 3 +++ file-roller.changes | 10 ++++++++++ file-roller.spec | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 file-roller-2.30.0.tar.bz2 create mode 100644 file-roller-2.30.1.1.tar.bz2 diff --git a/file-roller-2.30.0.tar.bz2 b/file-roller-2.30.0.tar.bz2 deleted file mode 100644 index a375bd2..0000000 --- a/file-roller-2.30.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1fa54fb3a2616506dc2908050adbb16128b70d60dad789b20817cd4b60102fa5 -size 1805950 diff --git a/file-roller-2.30.1.1.tar.bz2 b/file-roller-2.30.1.1.tar.bz2 new file mode 100644 index 0000000..2eedf15 --- /dev/null +++ b/file-roller-2.30.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a8bf476fa89b52fa2e7bec4c824ebc03136bbcb55ab3694dfe6e1c1aef401b4 +size 1816845 diff --git a/file-roller.changes b/file-roller.changes index 2a69fb4..1e3aff7 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Apr 29 14:23:48 CEST 2010 - dimstar@opensuse.org + +- Update to version 2.30.1.1: + + bgo#613298 - Extract multi-byte filename from URI in case of + DND +- Changes from version 2.30.1: + + bgo#615127 - Fixed build error when dbus is not available + + Updated translations. + ------------------------------------------------------------------- Mon Mar 29 23:58:00 CEST 2010 - vuntz@opensuse.org diff --git a/file-roller.spec b/file-roller.spec index 555aa24..0e2d0c7 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,5 +1,5 @@ # -# spec file for package file-roller (Version 2.30.0) +# spec file for package file-roller (Version 2.30.1.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: file-roller -Version: 2.30.0 +Version: 2.30.1.1 Release: 1 License: GPLv2+ Summary: An Archive Manager for GNOME From 0a3be951fd76f8c87a484390c579a18de429dd2f4e2b10817603aa17a04c63d9 Mon Sep 17 00:00:00 2001 From: Magnus Boman Date: Thu, 6 May 2010 21:39:51 +0000 Subject: [PATCH 2/2] Accepting request 39519 from home:msmeissn:branches:GNOME:Factory Copy from home:msmeissn:branches:GNOME:Factory/file-roller via accept of submit request 39519 revision 3. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/39519 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=75 --- file-roller-voidreturn.patch | 13 +++++++++++++ file-roller.changes | 5 +++++ file-roller.spec | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 file-roller-voidreturn.patch diff --git a/file-roller-voidreturn.patch b/file-roller-voidreturn.patch new file mode 100644 index 0000000..3129d81 --- /dev/null +++ b/file-roller-voidreturn.patch @@ -0,0 +1,13 @@ +Index: file-roller-2.30.1.1/src/eggtreemultidnd.c +=================================================================== +--- file-roller-2.30.1.1.orig/src/eggtreemultidnd.c ++++ file-roller-2.30.1.1/src/eggtreemultidnd.c +@@ -310,7 +310,7 @@ egg_tree_multi_drag_motion_event (GtkWid + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); + gtk_tree_selection_selected_foreach (selection, selection_foreach, &path_list); + if (path_list == NULL) +- return; ++ return FALSE; + + path_list = g_list_reverse (path_list); + diff --git a/file-roller.changes b/file-roller.changes index 1e3aff7..9a5c3fd 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 5 19:24:57 CEST 2010 - meissner@suse.de + +- fixed 1 void return warning + ------------------------------------------------------------------- Thu Apr 29 14:23:48 CEST 2010 - dimstar@opensuse.org diff --git a/file-roller.spec b/file-roller.spec index 0e2d0c7..6ad826c 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -25,6 +25,7 @@ Summary: An Archive Manager for GNOME Url: http://fileroller.sourceforge.net Group: Productivity/Archiving/Compression Source: ftp://ftp.gnome.org/pub/GNOME/sources/file-roller/2.18/%{name}-%{version}.tar.bz2 +Patch0: %name-voidreturn.patch BuildRequires: fdupes BuildRequires: gconf2-devel BuildRequires: glib2-devel @@ -89,6 +90,7 @@ This package contains a plugin to integrate File Roller into Nautilus. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build