pool/file-roller
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 203336 from home:dimstar:branches:GNOME:Factory

Browse Source 
Update to 3.10.1 - GNOME Stable branch, bugfix only (contains our patch merged) and translations.

OBS-URL: https://build.opensuse.org/request/show/203336
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=179
This commit is contained in:
Richard Brown 2013-10-15 10:56:16 +00:00 committed by Git OBS Bridge
parent 7e54608267
commit 2298d9233c
5 changed files with 13 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
file-roller-3.10.0.tar.xz
View File

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

3
file-roller-3.10.1.tar.xz Normal file
View File

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

43
file-roller-fix-tar-extraction.patch
View File

@ -1,43 +0,0 @@
From d05bdc3b60d928f1f40338208419f0ffa41195f6 Mon Sep 17 00:00:00 2001
From: Paolo Bacchilega <paobac@src.gnome.org>
Date: Sun, 29 Sep 2013 16:30:29 +0000
Subject: libarchive: fixed failure when extracting some tar archives
do not try to restore the creation time;
do not set the G_FILE_ATTRIBUTE_TIME_CREATED_USEC attribute
[bug #709035]
---
diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c
index 42673df..44aaad2 100644
--- a/src/fr-archive-libarchive.c
+++ b/src/fr-archive-libarchive.c
@@ -428,15 +428,8 @@ _g_file_info_create_from_entry (struct archive_entry *entry,
/* times */
- if (archive_entry_ctime_is_set (entry)) {
- g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_CREATED, archive_entry_ctime (entry));
- g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_CREATED_USEC, archive_entry_ctime_nsec (entry));
- }
-
- if (archive_entry_mtime_is_set (entry)) {
+ if (archive_entry_mtime_is_set (entry))
g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, archive_entry_mtime (entry));
- g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, archive_entry_mtime_nsec (entry));
- }
/* username */
@@ -529,7 +522,8 @@ restore_modification_time (GHashTable *created_folders,
info = g_file_info_new ();
g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, g_file_info_get_attribute_uint64 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED));
- g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC));
+ if (g_file_info_get_attribute_status (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC) == G_FILE_ATTRIBUTE_STATUS_SET)
+ g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC));
result = _g_file_set_attributes_from_info (file, info, cancellable, error);
g_object_unref (info);
--
cgit v0.9.2

9
file-roller.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Oct 14 21:08:12 UTC 2013 - dimstar@opensuse.org
- Update to version 3.10.1:
+ Fixed error when extracting tar archives (bgo#709932,
bgo#709035).
+ Updated translations.
- Drop file-roller-fix-tar-extraction.patch: fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 29 13:06:25 UTC 2013 - zaitor@opensuse.org Sun Sep 29 13:06:25 UTC 2013 - zaitor@opensuse.org

5
file-roller.spec
View File

@ -17,7 +17,7 @@
Name: file-roller Name: file-roller
Version: 3.10.0 Version: 3.10.1
Release: 0 Release: 0
Summary: An Archive Manager for GNOME Summary: An Archive Manager for GNOME
License: GPL-2.0+ License: GPL-2.0+
@ -28,8 +28,6 @@ Source: http://download.gnome.org/sources/file-roller/3.10/%{name}-%{ver
Patch0: file-roller-3.4-change-archiver-priority.patch Patch0: file-roller-3.4-change-archiver-priority.patch
# PATCH-FEATURE-OPENSUSE file-roller-pkg-match.patch bnc#696530 dimstar@opensuse.org -- List package match names for automatic installation using PK. # PATCH-FEATURE-OPENSUSE file-roller-pkg-match.patch bnc#696530 dimstar@opensuse.org -- List package match names for automatic installation using PK.
Patch1: file-roller-pkg-match.patch Patch1: file-roller-pkg-match.patch
# PATCH-FIX-UPSTREAM file-roller-fix-tar-extraction.patch bgo#697756, bgo#709035 zaitor@opensuse.org -- Fix untaring of that failed for tar files. Taken from upstream git.
Patch2: file-roller-fix-tar-extraction.patch
# Needed for directory ownership # Needed for directory ownership
BuildRequires: dbus-1 BuildRequires: dbus-1
BuildRequires: fdupes BuildRequires: fdupes
@ -102,7 +100,6 @@ This package contains a plugin to integrate File Roller into Nautilus.
%setup -q %setup -q
%patch0 %patch0
%patch1 -p1 %patch1 -p1
%patch2 -p1
translation-update-upstream translation-update-upstream
%build %build