From 97f8e38ce917305c4051fed4ce6bffbce7a7fedc474597d078b2da9a230f83ed Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 24 Sep 2013 20:03:30 +0000 Subject: [PATCH 1/2] Accepting request 200398 from home:dimstar:branches:GNOME:Factory Update to 3.10.0 OBS-URL: https://build.opensuse.org/request/show/200398 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-user-share?expand=0&rev=68 --- gnome-user-share-3.10.0.tar.xz | 3 +++ gnome-user-share-3.9.91.tar.xz | 3 --- gnome-user-share.changes | 6 ++++++ gnome-user-share.spec | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 gnome-user-share-3.10.0.tar.xz delete mode 100644 gnome-user-share-3.9.91.tar.xz diff --git a/gnome-user-share-3.10.0.tar.xz b/gnome-user-share-3.10.0.tar.xz new file mode 100644 index 0000000..0574087 --- /dev/null +++ b/gnome-user-share-3.10.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2dbeacab637eede5429521d7796abe40c3e9d3d842b9e5aa45453c54db08f500 +size 1088672 diff --git a/gnome-user-share-3.9.91.tar.xz b/gnome-user-share-3.9.91.tar.xz deleted file mode 100644 index 7479155..0000000 --- a/gnome-user-share-3.9.91.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a996edfb2c0dfc27d042c796cfdf009b482bed162ae1ae4239245f0f36660656 -size 1084448 diff --git a/gnome-user-share.changes b/gnome-user-share.changes index 29514c0..f55b452 100644 --- a/gnome-user-share.changes +++ b/gnome-user-share.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 24 13:45:59 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.10.0: + + Updated translations. + ------------------------------------------------------------------- Wed Sep 4 19:01:23 UTC 2013 - dimstar@opensuse.org diff --git a/gnome-user-share.spec b/gnome-user-share.spec index 5a6bac2..2c85dc0 100644 --- a/gnome-user-share.spec +++ b/gnome-user-share.spec @@ -17,13 +17,13 @@ Name: gnome-user-share -Version: 3.9.91 +Version: 3.10.0 Release: 0 Summary: GNOME user file sharing License: GPL-2.0+ Group: Productivity/Networking/File-Sharing Url: http://www.gnome.org/ -Source: http://download.gnome.org/sources/gnome-user-share/3.9/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-user-share/3.10/%{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: intltool BuildRequires: translation-update-upstream From 1fe311996cb3c1cd31a2b772e72dcb4ccb3726c62d72e3bff9c9b7554cc80797 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 25 Sep 2013 15:26:18 +0000 Subject: [PATCH 2/2] Accepting request 200485 from home:dimstar:branches:GNOME:Factory - Add gnome-user-share-downloads-nautilus-crash.patch: Do not crash nautilus when entering 'Downloads' location (bnc#841659, bgo#708530, bgo#708456). OBS-URL: https://build.opensuse.org/request/show/200485 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-user-share?expand=0&rev=69 --- ...-user-share-downloads-nautilus-crash.patch | 30 +++++++++++++++++++ gnome-user-share.changes | 7 +++++ gnome-user-share.spec | 3 ++ 3 files changed, 40 insertions(+) create mode 100644 gnome-user-share-downloads-nautilus-crash.patch diff --git a/gnome-user-share-downloads-nautilus-crash.patch b/gnome-user-share-downloads-nautilus-crash.patch new file mode 100644 index 0000000..f7ae1d3 --- /dev/null +++ b/gnome-user-share-downloads-nautilus-crash.patch @@ -0,0 +1,30 @@ +From 58fa6cff7fd9f4e59d5b1537794b5995b6de5d63 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Tue, 24 Sep 2013 23:26:04 +0200 +Subject: [PATCH] trivial: fix logic error + +The bar should become visible if we are EITHER in Downloads OR in +PUBLIC. + +Fixes bug 708456, which is about very strange crashes when entering +'Downloads' +--- + src/share-extension.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/share-extension.c b/src/share-extension.c +index c1654d4..bac2ac2 100644 +--- a/src/share-extension.c ++++ b/src/share-extension.c +@@ -153,7 +153,7 @@ nautilus_user_share_get_location_widget (NautilusLocationWidgetProvider *iface, + if (enable == FALSE) + return NULL; + +- if (is_dir[0] != FALSE && is_dir[1] != FALSE) { ++ if (is_dir[0] != FALSE || is_dir[1] != FALSE) { + bar = nautilus_share_bar_new (_("May be used to share or receive files")); + } else if (is_dir[0] != FALSE) { + #ifndef HAVE_BLUETOOTH +-- +1.8.4 + diff --git a/gnome-user-share.changes b/gnome-user-share.changes index f55b452..893c0ec 100644 --- a/gnome-user-share.changes +++ b/gnome-user-share.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 24 21:32:18 UTC 2013 - dimstar@opensuse.org + +- Add gnome-user-share-downloads-nautilus-crash.patch: Do not + crash nautilus when entering 'Downloads' location (bnc#841659, + bgo#708530, bgo#708456). + ------------------------------------------------------------------- Tue Sep 24 13:45:59 UTC 2013 - dimstar@opensuse.org diff --git a/gnome-user-share.spec b/gnome-user-share.spec index 2c85dc0..f98b13e 100644 --- a/gnome-user-share.spec +++ b/gnome-user-share.spec @@ -24,6 +24,8 @@ License: GPL-2.0+ Group: Productivity/Networking/File-Sharing Url: http://www.gnome.org/ Source: http://download.gnome.org/sources/gnome-user-share/3.10/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gnome-user-share-downloads-nautilus-crash.patch bnc#841659 bgo#708530 bgo#708456 dimstar@opensuse.org -- Do not crash nautilus when entering 'Downloads' location +Patch0: gnome-user-share-downloads-nautilus-crash.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: translation-update-upstream @@ -61,6 +63,7 @@ The program also allows to share files using ObexFTP over Bluetooth. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build