diff --git a/gnome-user-share-3.10.0.tar.xz b/gnome-user-share-3.10.0.tar.xz deleted file mode 100644 index 0574087..0000000 --- a/gnome-user-share-3.10.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2dbeacab637eede5429521d7796abe40c3e9d3d842b9e5aa45453c54db08f500 -size 1088672 diff --git a/gnome-user-share-3.10.1.tar.xz b/gnome-user-share-3.10.1.tar.xz new file mode 100644 index 0000000..d45d891 --- /dev/null +++ b/gnome-user-share-3.10.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d76f9537180db1708f164bf7bfd4b37aee4610c46e7c3aa17fd0e56cf8b51458 +size 381772 diff --git a/gnome-user-share-downloads-nautilus-crash.patch b/gnome-user-share-downloads-nautilus-crash.patch deleted file mode 100644 index f7ae1d3..0000000 --- a/gnome-user-share-downloads-nautilus-crash.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 893c0ec..2cfb103 100644 --- a/gnome-user-share.changes +++ b/gnome-user-share.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Nov 12 15:05:47 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.10.1 (bnc#849913): + + Fix share bar bugs that could make nautilus crash. + + Update share bar labels to match new Sharing panel. + + Remove unimplemented OBEX FTP support code. + + Remove dbus-glib dependency. + = Fix failure to receive files through OBEX Push (bnc#850083). + = Fix crash when switching VTs. + + Fix use-after-free bug. + + Fix a few memory leaks. + + Re-enable Bluetooth support by default. +- Drop gnome-user-share-downloads-nautilus-crash.patch: fixed + upstream. +- Drop pkgconfig(dbus-1) and pkgconfig(dbus-glib-1) BuildRequires: + no longer needed after the upstream cleanup. + ------------------------------------------------------------------- Tue Sep 24 21:32:18 UTC 2013 - dimstar@opensuse.org diff --git a/gnome-user-share.spec b/gnome-user-share.spec index f98b13e..2a98389 100644 --- a/gnome-user-share.spec +++ b/gnome-user-share.spec @@ -17,22 +17,18 @@ Name: gnome-user-share -Version: 3.10.0 +Version: 3.10.1 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.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 BuildRequires: update-desktop-files BuildRequires: yelp-tools -BuildRequires: pkgconfig(dbus-1) >= 1.1.1 -BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(glib-2.0) >= 2.28 BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.9.3 BuildRequires: pkgconfig(gtk+-3.0) @@ -63,7 +59,6 @@ The program also allows to share files using ObexFTP over Bluetooth. %lang_package %prep %setup -q -%patch0 -p1 translation-update-upstream %build @@ -81,7 +76,6 @@ rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print %suse_update_desktop_file gnome-user-share-webdav -%suse_update_desktop_file gnome-user-share-obexftp %suse_update_desktop_file gnome-user-share-obexpush %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot} @@ -102,12 +96,10 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README COPYING NEWS -%doc %{_datadir}/help/C/%{name}/ %{_libexecdir}/gnome-user-share %{_datadir}/gnome-user-share %{_libdir}/nautilus/extensions-3.0/libnautilus-share-extension.so %{_sysconfdir}/xdg/autostart/gnome-user-share-webdav.desktop -%{_sysconfdir}/xdg/autostart/gnome-user-share-obexftp.desktop %{_sysconfdir}/xdg/autostart/gnome-user-share-obexpush.desktop %{_datadir}/GConf/gsettings/gnome-user-share.convert %{_datadir}/glib-2.0/schemas/org.gnome.desktop.file-sharing.gschema.xml