fix .cab handling
This commit is contained in:
parent
c0e35ffc26
commit
313db2ce41
60
cab.patch
Normal file
60
cab.patch
Normal file
@ -0,0 +1,60 @@
|
||||
diff --git a/nautilus/nautilus-fileroller.c b/nautilus/nautilus-fileroller.c
|
||||
index e467e17..d67b69e 100644
|
||||
--- a/nautilus/nautilus-fileroller.c
|
||||
+++ b/nautilus/nautilus-fileroller.c
|
||||
@@ -151,7 +151,7 @@ static char *mime_types[] = {
|
||||
"application/x-bzip-compressed-tar",
|
||||
"application/x-bzip1",
|
||||
"application/x-bzip1-compressed-tar",
|
||||
- "application/x-cabinet",
|
||||
+ "application/vnd.ms-cab-compressed",
|
||||
"application/x-cbr",
|
||||
"application/x-cbz",
|
||||
"application/x-cd-image",
|
||||
diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
|
||||
index b24cbd5..ef1eb08 100644
|
||||
--- a/src/fr-command-7z.c
|
||||
+++ b/src/fr-command-7z.c
|
||||
@@ -512,7 +512,7 @@ fr_command_7z_handle_error (FrCommand *comm,
|
||||
|
||||
const char *sevenz_mime_types[] = { "application/x-7z-compressed",
|
||||
"application/x-arj",
|
||||
- "application/x-cabinet",
|
||||
+ "application/vnd.ms-cab-compressed",
|
||||
"application/x-cd-image",
|
||||
/*"application/x-cbr",*/
|
||||
"application/x-cbz",
|
||||
@@ -545,7 +545,10 @@ fr_command_7z_get_capabilities (FrCommand *comm,
|
||||
else if (is_mime_type (mime_type, "application/x-7z-compressed-tar")) {
|
||||
capabilities |= FR_COMMAND_CAN_READ_WRITE | FR_COMMAND_CAN_ENCRYPT | FR_COMMAND_CAN_ENCRYPT_HEADER | FR_COMMAND_CAN_CREATE_VOLUMES;
|
||||
}
|
||||
- else if (is_program_in_path ("7z")) {
|
||||
+ else if (is_mime_type (mime_type, "application/x-7z-compressed-tar")) {
|
||||
+ capabilities |= FR_COMMAND_CAN_READ_WRITE | FR_COMMAND_CAN_ENCRYPT | FR_COMMAND_CAN_ENCRYPT_HEADER | FR_COMMAND_CAN_CREATE_VOLUMES;
|
||||
+ }
|
||||
+ else if (is_program_in_path ("7z") || is_program_in_path ("7za")) {
|
||||
if (is_mime_type (mime_type, "application/x-rar")
|
||||
|| is_mime_type (mime_type, "application/x-cbr"))
|
||||
{
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index 0981a23..16cd83b 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -88,7 +88,7 @@ FrMimeTypeDescription mime_type_desc[] = {
|
||||
{ "application/x-bzip-compressed-tar", ".tar.bz2", N_("Tar compressed with bzip2 (.tar.bz2)"), 0 },
|
||||
{ "application/x-bzip1", ".bz", NULL, 0 },
|
||||
{ "application/x-bzip1-compressed-tar", ".tar.bz", N_("Tar compressed with bzip (.tar.bz)"), 0 },
|
||||
- { "application/x-cabinet", ".cab", N_("Cabinet (.cab)"), 0 },
|
||||
+ { "application/vnd.ms-cab-compressed", ".cab", N_("Cabinet (.cab)"), 0 },
|
||||
{ "application/x-cbr", ".cbr", N_("Rar Archived Comic Book (.cbr)"), 0 },
|
||||
{ "application/x-cbz", ".cbz", N_("Zip Archived Comic Book (.cbz)"), 0 },
|
||||
{ "application/x-cd-image", ".iso", NULL, 0 },
|
||||
@@ -130,7 +130,7 @@ FrExtensionType file_ext_type[] = {
|
||||
{ ".bin", "application/x-stuffit" },
|
||||
{ ".bz", "application/x-bzip" },
|
||||
{ ".bz2", "application/x-bzip" },
|
||||
- { ".cab", "application/x-cabinet" },
|
||||
+ { ".cab", "application/vnd.ms-cab-compressed" },
|
||||
{ ".cbr", "application/x-cbr" },
|
||||
{ ".cbz", "application/x-cbz" },
|
||||
{ ".cpio", "application/x-cpio" },
|
@ -11,11 +11,14 @@
|
||||
Summary: Tool for viewing and creating archives
|
||||
Name: file-roller
|
||||
Version: 2.27.90
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPLv2+
|
||||
Group: Applications/Archiving
|
||||
URL: http://download.gnome.org/sources/file-roller/
|
||||
Source: http://download.gnome.org/sources/file-roller/2.27/file-roller-%{version}.tar.bz2
|
||||
# http://bugzilla.gnome.org/show_bug.cgi?id=591868
|
||||
Patch0: cab.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: glib2-devel >= %{glib2_version}
|
||||
BuildRequires: pango-devel >= %{pango_version}
|
||||
@ -50,6 +53,7 @@ such as tar or zip files.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .cab
|
||||
|
||||
autoreconf -f -i
|
||||
|
||||
@ -128,6 +132,9 @@ fi
|
||||
%{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
|
||||
|
||||
%changelog
|
||||
* Fri Aug 14 2009 Matthias Clasen <mclasen@redhat.com> 2.27.90-2
|
||||
- Make opening .cab files work
|
||||
|
||||
* Tue Aug 11 2009 Matthias Clasen <mclasen@redhat.com> 2.27.90-1
|
||||
- Update to 2.27.90
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user