From 957d215b5bfee86b35118ba6ff10122cf56295a0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 27 May 2010 17:56:30 +0000 Subject: [PATCH] 2.31.1 --- .cvsignore | 2 +- file-roller.spec | 18 ++++++------------ sources | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.cvsignore b/.cvsignore index c177f07..f895133 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -file-roller-2.30.1.1.tar.bz2 +file-roller-2.31.1.tar.bz2 diff --git a/file-roller.spec b/file-roller.spec index 9837f73..fa2757d 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -10,13 +10,13 @@ Summary: Tool for viewing and creating archives Name: file-roller -Version: 2.30.1.1 -Release: 3%{?dist} +Version: 2.31.1 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Archiving URL: http://download.gnome.org/sources/file-roller/ #VCS: git:git://git.gnome.org/file-roller -Source: http://download.gnome.org/sources/file-roller/2.30/file-roller-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/file-roller/2.31/file-roller-%{version}.tar.bz2 BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} @@ -40,21 +40,12 @@ Requires: GConf2 # The context menu API changed in 2.2.0: Conflicts: nautilus < 2.2.0 -# https://bugzilla.gnome.org/show_bug.cgi?id=617840 -Patch0: tar7z.patch - -# from master -# http://bugzilla.gnome.org/show_bug.cgi?id=617769 -Patch1: file-roller-2.31.0-gvfs-fuse.patch - %description File Roller is an application for creating and viewing archives files, such as tar or zip files. %prep %setup -q -%patch0 -p1 -b .tarz7 -%patch1 -p1 -b .gvfs-fuse %build %configure --disable-scrollkeeper \ @@ -116,6 +107,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg %changelog +* Thu May 27 2010 Matthias Clasen 2.31.1-1 +- Update to 2.31.1 + * Mon May 17 2010 Tomas Bzatek 2.30.1.1-3 - Fix archive handling on remote GIO mounts without running fuse daemon (#527045, #518510) diff --git a/sources b/sources index 8978a3f..c5d2884 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a29a82396caf8c5726d7f0256e0ba02a file-roller-2.30.1.1.tar.bz2 +33d5e9a557c30603ff58c9603ad33e48 file-roller-2.31.1.tar.bz2