Hello community,
here is the log from the commit of package file-roller for openSUSE:Factory
checked in at 2013-10-01 08:11:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/file-roller (Old)
and /work/SRC/openSUSE:Factory/.file-roller.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file-roller"
Changes:
--------
--- /work/SRC/openSUSE:Factory/file-roller/file-roller.changes 2013-09-27
17:09:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.file-roller.new/file-roller.changes
2013-10-01 08:11:52.000000000 +0200
@@ -1,0 +2,14 @@
+Sun Sep 29 13:06:25 UTC 2013 - zai...@opensuse.org
+
+- Add file-roller-fix-tar-extraction.patch, fixes untaring that
+ failed on some tar files (bgo#697756, bgo#709035).
+- Remove V=1 from make as it only fills up the obs buildlog to no
+ use, debugging is done locally anyway.
+- Add lzip and lzop to suggested packages, as these are now
+ available in openSUSE.
+- Stop passing --disable-scrollkeeper to configure, neither
+ recognized nor needed anymore.
+- Remove %if conditional for obsolete versions of openSUSE, those
+ are out of support a long time ago.
+
+-------------------------------------------------------------------
New:
----
file-roller-fix-tar-extraction.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ file-roller.spec ++++++
--- /var/tmp/diff_new_pack.oJfSrB/_old 2013-10-01 08:11:52.000000000 +0200
+++ /var/tmp/diff_new_pack.oJfSrB/_new 2013-10-01 08:11:52.000000000 +0200
@@ -28,6 +28,8 @@
Patch0: file-roller-3.4-change-archiver-priority.patch
# PATCH-FEATURE-OPENSUSE file-roller-pkg-match.patch bnc#696530
dims...@opensuse.org -- List package match names for automatic installation
using PK.
Patch1: file-roller-pkg-match.patch
+# PATCH-FIX-UPSTREAM file-roller-fix-tar-extraction.patch bgo#697756,
bgo#709035 zai...@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
BuildRequires: dbus-1
BuildRequires: fdupes
@@ -59,6 +61,8 @@
Recommends: zip
# Additional formats that are supported
Suggests: lha
+Suggests: lzip
+Suggests: lzop
Suggests: rzip
Suggests: zoo
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -67,8 +71,6 @@
# we could package.
#Suggests: arj
#Suggests: lrzip
-#Suggests: lzip
-#Suggests: lzop
#Suggests: ncompress
#Suggests: rar
#Suggests: theunarchiver
@@ -100,19 +102,16 @@
%setup -q
%patch0
%patch1 -p1
+%patch2 -p1
translation-update-upstream
%build
%configure\
- --disable-scrollkeeper \
--enable-magic
-make %{?_smp_mflags} V=1
+make %{?_smp_mflags}
%install
%make_install
-%if 0%{?suse_version} <= 1120
-rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
-%endif
%suse_update_desktop_file %{name}
%find_lang %{name} %{?no_lang_C}
rm %{buildroot}%{_libdir}/*/*/*.*a
++++++ file-roller-fix-tar-extraction.patch ++++++
>From d05bdc3b60d928f1f40338208419f0ffa41195f6 Mon Sep 17 00:00:00 2001
From: Paolo Bacchilega <pao...@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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
