From c964011bc91c705a6e7e97426a17d0c476688dae5ca4ae8cd55dc201f0add67c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 6 Dec 2011 17:14:52 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/gnome-user-share revision 35.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-user-share?expand=0&rev=8b7c15d76288fcac0cd3c4ff31967d35 --- gnome-user-share.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-user-share.spec b/gnome-user-share.spec index 1f8ffa8..6d149db 100644 --- a/gnome-user-share.spec +++ b/gnome-user-share.spec @@ -21,7 +21,7 @@ Name: gnome-user-share Summary: GNOME user file sharing Version: 3.0.1 Release: 1 -License: GPLv2+ +License: GPL-2.0+ Group: Productivity/Networking/File-Sharing Source: http://download.gnome.org/sources/gnome-user-share/3.0/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM gnome-user-share-includes.patch bgo#664929 dimstar@opensuse.org -- Include string.h in order to have strcmp defined. From 09becfbc4f6390ecb5c83bc34a58dcaf6dd6cb9e3aa52efa9881526be3c1fd4d Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 26 Mar 2012 08:01:11 +0000 Subject: [PATCH 2/2] Accepting request 110673 from home:vuntz:branches:GNOME:Factory Update to 3.0.2 OBS-URL: https://build.opensuse.org/request/show/110673 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-user-share?expand=0&rev=55 --- gnome-user-share-3.0.1.tar.bz2 | 3 --- gnome-user-share-3.0.2.tar.xz | 3 +++ gnome-user-share-includes.patch | 24 ------------------------ gnome-user-share.changes | 11 +++++++++++ gnome-user-share.spec | 15 +++++---------- 5 files changed, 19 insertions(+), 37 deletions(-) delete mode 100644 gnome-user-share-3.0.1.tar.bz2 create mode 100644 gnome-user-share-3.0.2.tar.xz delete mode 100644 gnome-user-share-includes.patch diff --git a/gnome-user-share-3.0.1.tar.bz2 b/gnome-user-share-3.0.1.tar.bz2 deleted file mode 100644 index 57f9f5a..0000000 --- a/gnome-user-share-3.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06e576cefc9f7d78a3066b3fbcf6d0a573301628e48242f1ffb8a28abe0b714b -size 1134756 diff --git a/gnome-user-share-3.0.2.tar.xz b/gnome-user-share-3.0.2.tar.xz new file mode 100644 index 0000000..621d6ac --- /dev/null +++ b/gnome-user-share-3.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34a5b6e340025e8466233f374898a6e293839f6785c0abf14eed86d1f3d22ffd +size 1008128 diff --git a/gnome-user-share-includes.patch b/gnome-user-share-includes.patch deleted file mode 100644 index e00d6cc..0000000 --- a/gnome-user-share-includes.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 7531029125b292fa4843bd3e253b3b18a60806eb Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Sun, 27 Nov 2011 21:01:18 +0100 -Subject: [PATCH] Include string.h in order to have strcmp defined. - ---- - src/user_share-common.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/src/user_share-common.c b/src/user_share-common.c -index 31389eb..614ffb1 100644 ---- a/src/user_share-common.c -+++ b/src/user_share-common.c -@@ -23,6 +23,7 @@ - */ - - #include "user_share-common.h" -+#include // For strcmp - - static char * - lookup_special_dir (GUserDirectory directory, --- -1.7.7 - diff --git a/gnome-user-share.changes b/gnome-user-share.changes index fa1ddb2..9249cce 100644 --- a/gnome-user-share.changes +++ b/gnome-user-share.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Mar 22 18:56:54 UTC 2012 - vuntz@opensuse.org + +- Update to version 3.0.2: + + Port from libunique to GtkApplication + + Add missing string.h include + + Build cleanups + + Updated translations. +- Remove pkgconfig(unique-3.0) BuildRequires: dropped upstream. +- Drop gnome-user-share-includes.patch: fixed upstream. + ------------------------------------------------------------------- Sun Nov 27 20:02:23 UTC 2011 - dimstar@opensuse.org diff --git a/gnome-user-share.spec b/gnome-user-share.spec index 6d149db..125ac20 100644 --- a/gnome-user-share.spec +++ b/gnome-user-share.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-user-share # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,13 @@ # - Name: gnome-user-share Summary: GNOME user file sharing -Version: 3.0.1 -Release: 1 License: GPL-2.0+ Group: Productivity/Networking/File-Sharing -Source: http://download.gnome.org/sources/gnome-user-share/3.0/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM gnome-user-share-includes.patch bgo#664929 dimstar@opensuse.org -- Include string.h in order to have strcmp defined. -Patch0: gnome-user-share-includes.patch +Version: 3.0.2 +Release: 0 +Source: http://download.gnome.org/sources/gnome-user-share/3.0/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE gnome-user-share-soft-dep-apache.patch vuntz@novell.com -- Hide apache option in the UI if it's not available Patch3: gnome-user-share-soft-dep-apache.patch Url: http://www.gnome.org/ @@ -37,13 +34,12 @@ BuildRequires: update-desktop-files BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gconf-2.0) -BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.28 BuildRequires: pkgconfig(gnome-bluetooth-1.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libnautilus-extension) BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(unique-3.0) Requires: obex-data-server Recommends: %{name}-lang Suggests: apache2-prefork @@ -69,7 +65,6 @@ The program also allows to share files using ObexFTP over Bluetooth. %prep %setup -q translation-update-upstream -%patch0 -p1 %patch3 -p1 %build