This commit is contained in:
Matthias Clasen 2008-08-23 01:22:58 +00:00
parent 316ea78944
commit f9d72a036d
5 changed files with 8 additions and 38 deletions

View File

@ -1 +1 @@
file-roller-2.23.5.tar.bz2 file-roller-2.23.6.tar.bz2

View File

@ -10,8 +10,8 @@
Summary: File Roller is a tool for viewing and creating archives Summary: File Roller is a tool for viewing and creating archives
Name: file-roller Name: file-roller
Version: 2.23.5 Version: 2.23.6
Release: 3%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/Archiving Group: Applications/Archiving
URL: http://download.gnome.org/sources/file-roller/ URL: http://download.gnome.org/sources/file-roller/
@ -44,19 +44,12 @@ Requires: GConf2
# The context menu API changed in 2.2.0: # The context menu API changed in 2.2.0:
Conflicts: nautilus < 2.2.0 Conflicts: nautilus < 2.2.0
# http://bugzilla.gnome.org/show_bug.cgi?id=546978
Patch0: folder-icon.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=547017
Patch1: open-with.patch
%description %description
File Roller is an application for creating and viewing archives files, File Roller is an application for creating and viewing archives files,
such as tar files. such as tar files.
%prep %prep
%setup -q %setup -q
%patch0 -p0 -b .folder-icon
%patch1 -p0 -b .open-with
autoreconf autoreconf
@ -135,6 +128,10 @@ fi
%{_datadir}/icons/hicolor/scalable/apps/file-roller.svg %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
%changelog %changelog
* Fri Aug 22 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.6-1
- Update to 2.23.6
- Drop upstreamed patches
* Fri Aug 8 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.5-3 * Fri Aug 8 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.5-3
- Fix a segfault - Fix a segfault

View File

@ -1,13 +0,0 @@
Index: src/file-utils.h
===================================================================
--- src/file-utils.h (revision 2411)
+++ src/file-utils.h (working copy)
@@ -28,7 +28,7 @@
#include <unistd.h>
#include <gio/gio.h>
-#define MIME_TYPE_DIRECTORY "gnome-fs-directory"
+#define MIME_TYPE_DIRECTORY "folder"
#define MIME_TYPE_ARCHIVE "application/x-archive"
#define get_home_relative_path(x) \

View File

@ -1,14 +0,0 @@
Index: src/dlg-open-with.c
===================================================================
--- src/dlg-open-with.c (revision 2411)
+++ src/dlg-open-with.c (working copy)
@@ -410,6 +411,9 @@
icon_image = get_icon_pixbuf (theme, G_THEMED_ICON (icon), icon_size);
g_object_unref (icon);
}
+ else {
+ icon_image = NULL;
+ }
gtk_list_store_append (GTK_LIST_STORE (data->app_model),
&iter);

View File

@ -1 +1 @@
ab7534b92d1a8c29da39862490c84940 file-roller-2.23.5.tar.bz2 ef4cd14f8129bfde4c6c49643cc91332 file-roller-2.23.6.tar.bz2