Accepting request 162173 from GNOME:Factory

Push G:Factory

OBS-URL: https://build.opensuse.org/request/show/162173
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-user-share?expand=0&rev=40

gnome-user-share-3.0.4.tar.xz

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

gnome-user-share-3.8.0.tar.xz

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

gnome-user-share-soft-dep-apache.patch

@@ -1,14 +0,0 @@
-Index: gnome-user-share-3.0.3/src/file-share-properties.c
-===================================================================
---- gnome-user-share-3.0.3.orig/src/file-share-properties.c
-+++ gnome-user-share-3.0.3/src/file-share-properties.c
-@@ -358,6 +358,9 @@ create_window (void)
- 
-     window = GTK_WIDGET (gtk_builder_get_object (builder, "user_share_dialog"));
- 
-+    if (!g_file_test (HTTPD_PROGRAM, G_FILE_TEST_EXISTS))
-+      gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "vbox3")));
-+
-     check = GTK_WIDGET (gtk_builder_get_object (builder, "enable_check"));
-     password_combo = GTK_WIDGET (gtk_builder_get_object (builder, "password_combo"));
-     password_entry = GTK_WIDGET (gtk_builder_get_object (builder, "password_entry"));

gnome-user-share.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Mon Mar 25 11:49:07 UTC 2013 - zaitor@opensuse.org
+
+- Update to version 3.8.0:
+  + Updated translations.
+
+-------------------------------------------------------------------
+Tue Mar  5 15:40:06 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.7.91:
+  + Add support for logind seat-tracking using gnome-session.
+  + Add support for Apache HTTPD 2.4.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Feb 20 20:30:27 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.7.90:
+  + Build .tar.xz tarballs by default.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Tue Jan 15 18:23:41 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.7.4:
+  + Remove preferences as they're now integrated with
+    gnome-control-center 3.7.4.
+- Drop gnome-user-share-soft-dep-apache.patch: no longer applies,
+  as we don't have a properties dialog anymore.
+
 -------------------------------------------------------------------
 Tue Sep 25 10:33:08 UTC 2012 - dimstar@opensuse.org
 

gnome-user-share.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-user-share
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -17,24 +17,22 @@
 
 
 Name:           gnome-user-share
-Version:        3.0.4
+Version:        3.8.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.0/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gnome-user-share/3.8/%{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
-Patch0:         gnome-user-share-soft-dep-apache.patch
 BuildRequires:  fdupes
 BuildRequires:  intltool
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  yelp-tools
-BuildRequires:  pkgconfig(dbus-1)
+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)
+BuildRequires:  pkgconfig(gnome-bluetooth-1.0) >= 2.91.5
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libcanberra-gtk3)
 BuildRequires:  pkgconfig(libnautilus-extension)
@@ -64,7 +62,6 @@ The program also allows to share files using ObexFTP over Bluetooth.
 %prep
 %setup -q
 translation-update-upstream
-%patch0 -p1
 
 %build
 %configure \
@@ -80,9 +77,6 @@ make %{?_smp_mflags}
 rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
 find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
-# X-GNOME-NetworkSettings is okay upstream, but it makes the item appear misplaced with our menu structure
-grep -q X-GNOME-NetworkSettings %{buildroot}%{_datadir}/applications/gnome-user-share-properties.desktop
-%suse_update_desktop_file -r gnome-user-share-properties GNOME System X-SuSE-ControlCenter-Personal
 %suse_update_desktop_file gnome-user-share
 %find_lang %{name} %{?no_lang_C}
 %fdupes %{buildroot}
@@ -104,9 +98,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc README COPYING NEWS
 %doc %{_datadir}/help/C/%{name}/
-%{_bindir}/*
 %{_libexecdir}/gnome-user-share
-%{_datadir}/applications/*
 %{_datadir}/gnome-user-share
 %{_libdir}/nautilus/extensions-3.0/libnautilus-share-extension.so
 %{_sysconfdir}/xdg/autostart/gnome-user-share.desktop