diff --git a/.cvsignore b/.cvsignore index 49dd813..9bc10c6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-user-share-2.27.0.tar.bz2 +gnome-user-share-2.28.0.tar.bz2 diff --git a/0001-Bug-594252-WebDAV-share-name-untraslated-at-runti.patch b/0001-Bug-594252-WebDAV-share-name-untraslated-at-runti.patch deleted file mode 100644 index fed78fe..0000000 --- a/0001-Bug-594252-WebDAV-share-name-untraslated-at-runti.patch +++ /dev/null @@ -1,41 +0,0 @@ -From faecaeb8f4f84a03528b29e82f12138f9d55dd13 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 7 Sep 2009 14:11:33 +0100 -Subject: [PATCH] =?utf-8?q?Bug=C2=A0594252=20-=20WebDAV=20share=20name=20untraslated=20at=20runtime?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -Init the i18n system in our session daemon, otherwise we -won't ever translate anything... ---- - src/user_share.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/src/user_share.c b/src/user_share.c -index 07868c0..6a982c0 100644 ---- a/src/user_share.c -+++ b/src/user_share.c -@@ -475,6 +475,10 @@ main (int argc, char **argv) - Window selection_owner; - Atom xatom; - -+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); -+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); -+ textdomain (GETTEXT_PACKAGE); -+ - gtk_init (&argc, &argv); - - if (g_strcmp0 (g_get_real_name (), "root") == 0) { -@@ -489,7 +493,7 @@ main (int argc, char **argv) - - xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); - if (xdisplay == NULL) { -- fprintf (stderr, "Can't open display\n"); -+ g_warning ("Can't open display"); - return 1; - } - --- -1.6.2.5 - diff --git a/gnome-user-share.spec b/gnome-user-share.spec index 90622d4..19a0135 100644 --- a/gnome-user-share.spec +++ b/gnome-user-share.spec @@ -1,17 +1,15 @@ Summary: Gnome user file sharing Name: gnome-user-share -Version: 2.27.0 -Release: 3%{?dist} +Version: 2.28.0 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-user-share/2.27/%{name}-%{version}.tar.bz2 # http://bugzilla.gnome.org/show_bug.cgi?id=578090 Patch0: menu-path.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=594252 -Patch1: 0001-Bug-594252-WebDAV-share-name-untraslated-at-runti.patch # http://bugzilla.gnome.org/show_bug.cgi?id=558244 -Patch2: 0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch +Patch1: 0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch BuildRequires: intltool automake autoconf libtool BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,8 +51,7 @@ The program also allows to share files using ObexFTP over Bluetooth. %prep %setup -q %patch0 -p1 -b .menu-path -%patch1 -p1 -b .i18n -%patch2 -p1 -b .cluebar +%patch1 -p1 -b .cluebar autoreconf -f -i @@ -137,6 +134,9 @@ fi %{_libdir}/nautilus/extensions-2.0/*.so %changelog +* Mon Sep 21 2009 Bastien Nocera 2.28.0-1 +- Update to 2.28.0 + * Tue Sep 08 2009 Bastien Nocera 2.27.0-3 - Add a cluebar to have easy access to the file sharing preferences diff --git a/sources b/sources index 20b6ac2..7ae1e7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6900aa1c9b2fcfbc6d89762063c37efa gnome-user-share-2.27.0.tar.bz2 +8ccaca15e42036b42a54f997ffbac3a7 gnome-user-share-2.28.0.tar.bz2