Accepting request 795174 from GNOME:Factory

Scripted push of project GNOME:Next (forwarded request 795018 from iznogood)

OBS-URL: https://build.opensuse.org/request/show/795174
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file-roller?expand=0&rev=147
This commit is contained in:
Dominique Leuenberger 2020-04-23 16:26:05 +00:00 committed by Git OBS Bridge
commit c0ca8e972b
5 changed files with 53 additions and 28 deletions

View File

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

View File

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

View File

@ -1,8 +1,51 @@
-------------------------------------------------------------------
Fri Apr 3 05:56:17 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 3.36.1:
+ Fixed Properties command in menubar.
+ Fixed compiling with GCC 10.
+ Updated translations.
- Drop gcc-fno-common-fix.patch: Fixed upstream.
-------------------------------------------------------------------
Fri Apr 3 05:56:16 UTC 2020 - Martin Liška <mliska@suse.cz>
- Add gcc-fno-common-fix.patch in order to fix boo#1160390.
-------------------------------------------------------------------
Sun Mar 8 21:26:16 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 3.36.0:
+ Updated manual.
+ Updated translations.
-------------------------------------------------------------------
Sun Mar 1 00:01:43 UTC 2020 - mgorse@suse.com
- Update to version 3.35.92:
+ Updated manual.
+ Updated translations.
-------------------------------------------------------------------
Tue Feb 18 16:37:53 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 3.35.91:
+ Updated manual.
+ Updated translations.
-------------------------------------------------------------------
Sat Feb 15 19:05:29 UTC 2020 - dimstar@opensuse.org
- Update to version 3.35.90:
+ Updated translations.
- Changes from version 3.35.1:
+ Support for Zstandard compressed files/archives.
+ Allow to directly open .tar.lzo files.
+ libarchive: implemented read support for 7z.
+ Provide a development variant of the app icon.
+ Remove file-roller from the recommended applications for ePub
files.
-------------------------------------------------------------------
Sat Feb 15 19:05:28 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -17,13 +17,13 @@
Name: file-roller
Version: 3.32.4
Version: 3.36.1
Release: 0
Summary: An Archive Manager for GNOME
License: GPL-2.0-or-later
Group: Productivity/Archiving/Compression
URL: https://wiki.gnome.org/Apps/FileRoller
Source0: https://download.gnome.org/sources/file-roller/3.32/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/file-roller/3.36/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE file-roller-3.4-change-archiver-priority.patch bnc#767386 gankov@opensuse.org -- Give unzip a higher priority than 7z when unpackging zip files. Gives better results for non-latin charsets.
Patch0: file-roller-3.4-change-archiver-priority.patch
@ -31,20 +31,18 @@ Patch0: file-roller-3.4-change-archiver-priority.patch
Patch1: file-roller-pkg-match.patch
# PATCH-FIX-OPENSUSE file-roller-ignore-unrar-if-wrapper.patch bsc#1072118 mgorse@suse.com -- if unrar is a wrapper script for unar, then ignore it, and use unar instead.
Patch2: file-roller-ignore-unrar-if-wrapper.patch
# PATCH-FIX-UPSTREAM gcc-fno-common-fix.patch boo#1160390 -- Fix build with fno-common
Patch3: gcc-fno-common-fix.patch
# Needed for directory ownership
BuildRequires: dbus-1
BuildRequires: fdupes
BuildRequires: file-devel
BuildRequires: meson
BuildRequires: meson >= 0.50
BuildRequires: pkgconfig
BuildRequires: translation-update-upstream
BuildRequires: yelp-tools
BuildRequires: pkgconfig(glib-2.0) >= 2.36.0
BuildRequires: pkgconfig(glib-2.0) >= 2.38.0
BuildRequires: pkgconfig(gthread-2.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.13.2
BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0
BuildRequires: pkgconfig(json-glib-1.0) >= 0.14.0
BuildRequires: pkgconfig(libarchive) >= 3.0.0
BuildRequires: pkgconfig(libnotify) >= 0.4.3
@ -85,11 +83,7 @@ contained in the archive, and extract files from the archive.
%lang_package
%prep
%autosetup -N
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%autosetup -p1
translation-update-upstream po %{name}
%build
@ -107,7 +101,7 @@ translation-update-upstream po %{name}
%files
%license COPYING
%doc AUTHORS NEWS README
%doc AUTHORS NEWS
%{_bindir}/file-roller
%{_libexecdir}/file-roller/
%dir %{_datadir}/metainfo

View File

@ -1,12 +0,0 @@
diff --git a/src/fr-application.c b/src/fr-application.c
index c148c4f..00ebe55 100644
--- a/src/fr-application.c
+++ b/src/fr-application.c
@@ -42,7 +42,6 @@
#define SERVICE_TIMEOUT 10
-gint ForceDirectoryCreation;
static char **remaining_args;
static char *arg_add_to = NULL;
static int arg_add = FALSE;