1
0

Accepting request 111740 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/111740
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-user-share?expand=0&rev=36
This commit is contained in:
Stephan Kulow 2012-03-29 11:57:21 +00:00 committed by Git OBS Bridge
commit 8e92e18c3e
5 changed files with 19 additions and 37 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:06e576cefc9f7d78a3066b3fbcf6d0a573301628e48242f1ffb8a28abe0b714b
size 1134756

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:34a5b6e340025e8466233f374898a6e293839f6785c0abf14eed86d1f3d22ffd
size 1008128

View File

@ -1,24 +0,0 @@
From 7531029125b292fa4843bd3e253b3b18a60806eb Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
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 <string.h> // For strcmp
static char *
lookup_special_dir (GUserDirectory directory,
--
1.7.7

View File

@ -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 Sun Nov 27 20:02:23 UTC 2011 - dimstar@opensuse.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package gnome-user-share # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,16 +16,13 @@
# #
Name: gnome-user-share Name: gnome-user-share
Summary: GNOME user file sharing Summary: GNOME user file sharing
Version: 3.0.1
Release: 1
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Networking/File-Sharing Group: Productivity/Networking/File-Sharing
Source: http://download.gnome.org/sources/gnome-user-share/3.0/%{name}-%{version}.tar.bz2 Version: 3.0.2
# PATCH-FIX-UPSTREAM gnome-user-share-includes.patch bgo#664929 dimstar@opensuse.org -- Include string.h in order to have strcmp defined. Release: 0
Patch0: gnome-user-share-includes.patch 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 # 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 Patch3: gnome-user-share-soft-dep-apache.patch
Url: http://www.gnome.org/ Url: http://www.gnome.org/
@ -37,13 +34,12 @@ BuildRequires: update-desktop-files
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gconf-2.0) 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(gnome-bluetooth-1.0)
BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libnautilus-extension) BuildRequires: pkgconfig(libnautilus-extension)
BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(unique-3.0)
Requires: obex-data-server Requires: obex-data-server
Recommends: %{name}-lang Recommends: %{name}-lang
Suggests: apache2-prefork Suggests: apache2-prefork
@ -69,7 +65,6 @@ The program also allows to share files using ObexFTP over Bluetooth.
%prep %prep
%setup -q %setup -q
translation-update-upstream translation-update-upstream
%patch0 -p1
%patch3 -p1 %patch3 -p1
%build %build