Accepting request 638779 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/638779
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file-roller?expand=0&rev=141

file-roller-3.28.1.tar.xz

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

file-roller-3.30.1.tar.xz

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

file-roller-3.4-change-archiver-priority.patch

@@ -1,8 +1,8 @@
-Index: src/fr-init.c
+Index: file-roller-3.29.91/src/fr-init.c
 ===================================================================
---- src/fr-init.c.orig
+--- file-roller-3.29.91.orig/src/fr-init.c	2018-08-27 20:37:42.000000000 +0200
-+++ src/fr-init.c
++++ file-roller-3.29.91/src/fr-init.c	2018-08-29 01:05:09.851754510 +0200
-@@ -364,6 +364,7 @@ register_archives (void)
+@@ -368,6 +368,7 @@ register_archives (void)
  
  	register_archive (FR_TYPE_COMMAND_TAR);
  	register_archive (FR_TYPE_COMMAND_CFILE);
@@ -10,7 +10,7 @@ Index: src/fr-init.c
  	register_archive (FR_TYPE_COMMAND_7Z);
  	register_archive (FR_TYPE_COMMAND_DPKG);
  
-@@ -379,7 +380,6 @@ register_archives (void)
+@@ -383,7 +384,6 @@ register_archives (void)
  	register_archive (FR_TYPE_COMMAND_RPM);
  	register_archive (FR_TYPE_COMMAND_UNSQUASHFS);
  	register_archive (FR_TYPE_COMMAND_UNSTUFF);

file-roller-ignore-unrar-if-wrapper.patch

@@ -1,7 +1,8 @@
-diff -urp file-roller-3.26.2.orig/src/fr-command-rar.c file-roller-3.26.2/src/fr-command-rar.c
+Index: file-roller-3.29.91/src/fr-command-rar.c
---- file-roller-3.26.2.orig/src/fr-command-rar.c	2017-10-31 15:07:52.000000000 -0500
+===================================================================
-+++ file-roller-3.26.2/src/fr-command-rar.c	2017-12-13 12:25:16.159981774 -0600
+--- file-roller-3.29.91.orig/src/fr-command-rar.c	2018-08-27 20:37:42.000000000 +0200
-@@ -705,6 +705,39 @@ fr_command_rar_get_mime_types (FrArchive
++++ file-roller-3.29.91/src/fr-command-rar.c	2018-08-29 01:05:09.879754204 +0200
+@@ -763,6 +763,39 @@ fr_command_rar_get_mime_types (FrArchive
  	return rar_mime_type;
  }
  
@@ -41,7 +42,7 @@ diff -urp file-roller-3.26.2.orig/src/fr-command-rar.c file-roller-3.26.2/src/fr
  
  static FrArchiveCap
  fr_command_rar_get_capabilities (FrArchive  *archive,
-@@ -716,7 +749,7 @@ fr_command_rar_get_capabilities (FrArchi
+@@ -774,7 +807,7 @@ fr_command_rar_get_capabilities (FrArchi
  	capabilities = FR_ARCHIVE_CAN_STORE_MANY_FILES | FR_ARCHIVE_CAN_ENCRYPT | FR_ARCHIVE_CAN_ENCRYPT_HEADER;
  	if (_g_program_is_available ("rar", check_command))
  		capabilities |= FR_ARCHIVE_CAN_READ_WRITE | FR_ARCHIVE_CAN_CREATE_VOLUMES;

file-roller-pkg-match.patch

@@ -1,7 +1,7 @@
-diff --git a/data/packages.match b/data/packages.match
+Index: file-roller-3.29.91/data/packages.match
-index 78b9fe3..25775c0 100644
+===================================================================
---- a/data/packages.match
+--- file-roller-3.29.91.orig/data/packages.match	2018-08-27 20:37:41.000000000 +0200
-+++ b/data/packages.match
++++ file-roller-3.29.91/data/packages.match	2018-08-29 01:05:09.863754379 +0200
 @@ -6,15 +6,15 @@ cpio=
  dpkg=
  genisoimage=

file-roller.changes

@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Wed Sep 26 17:11:09 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 3.30.1:
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sun Sep  9 07:44:59 UTC 2018 - antoine.belvire@opensuse.org
+
+- Update to version 3.30.0:
+  + Updated translations.
+- Remove lang package from recommended package as it already
+  supplements main package (same effect, it's redundant).
+
+-------------------------------------------------------------------
+Tue Aug 28 23:03:45 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 3.29.91:
+  + Bugs fixed:
+    - Fixed loading of .epub and .crx files.
+    - Path traversal vulnerability. Do not extract files with
+      relative paths (bgo#794337).
+  + Updated translations.
+- Refresh patches with quilt, use autosetup macro.
+
+-------------------------------------------------------------------
+Tue Jul 31 06:38:14 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 3.29.90:
+  + Restored app menu.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sat Jul 28 00:12:43 UTC 2018 - luc14n0@linuxmail.org
+
+- Update to version 3.29.1:
+  + New features and user visible changes: Removed app menu.
+
 -------------------------------------------------------------------
 Mon Jul 23 10:27:54 UTC 2018 - dimstar@opensuse.org
 

file-roller.spec

@@ -12,24 +12,26 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           file-roller
-Version:        3.28.1
+Version:        3.30.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
-Source:         http://download.gnome.org/sources/file-roller/3.28/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/file-roller/3.30/%{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
 # 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
 # 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
+
 # Needed for directory ownership
 BuildRequires:  dbus-1
 BuildRequires:  fdupes
@@ -44,7 +46,6 @@ BuildRequires:  pkgconfig(gtk+-3.0) >= 3.13.2
 BuildRequires:  pkgconfig(json-glib-1.0) >= 0.14.0
 BuildRequires:  pkgconfig(libarchive) >= 3.0.0
 BuildRequires:  pkgconfig(libnotify) >= 0.4.3
-Recommends:     %{name}-lang
 # Formats that we likely want to support by default
 Recommends:     bzip2
 Recommends:     cpio
@@ -82,17 +83,15 @@ contained in the archive, and extract files from the archive.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
-%patch0
-%patch1 -p1
-%patch2 -p1
 translation-update-upstream po %{name}
 
 %build
 %meson \
-  -D notification=true \
+	-D notification=true \
-  -D libarchive=true \
+	-D libarchive=true \
-  -D magic=true \
+	-D magic=true \
+	%{nil}
 %meson_build
 
 %install