From 932fddeb6a5f203ff5403ba18f27681fe0f09c8c485e227d955c02ed429da2c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Wed, 19 Jan 2022 17:24:21 +0000
Subject: [PATCH] Accepting request 946716 from GNOME:Next

Go git - 51 commits of translations.... + fix 7zip Recomends

OBS-URL: https://build.opensuse.org/request/show/946716
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=305
---
 _service                      | 19 +++++++++++++++++++
 file-roller-3.40.0+51.obscpio |  3 +++
 file-roller-3.40.0.tar.xz     |  3 ---
 file-roller.changes           |  9 +++++++++
 file-roller.obsinfo           |  4 ++++
 file-roller.spec              | 12 ++++++++----
 6 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 _service
 create mode 100644 file-roller-3.40.0+51.obscpio
 delete mode 100644 file-roller-3.40.0.tar.xz
 create mode 100644 file-roller.obsinfo

diff --git a/_service b/_service
new file mode 100644
index 0000000..89f5ba1
--- /dev/null
+++ b/_service
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<services>
+  <service name="obs_scm" mode="disabled">
+    <param name="url">https://gitlab.gnome.org/GNOME/file-roller.git</param>
+    <param name="scm">git</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
+    <param name="revision">master</param>
+    <param name="versionrewrite-pattern">(.*)\+0</param>
+    <param name="versionrewrite-replacement">\1</param>
+  </service>
+  <service name="tar" mode="buildtime" />
+  <service name="recompress" mode="buildtime">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service name="set_version" mode="disabled"/>
+</services>
+
+
diff --git a/file-roller-3.40.0+51.obscpio b/file-roller-3.40.0+51.obscpio
new file mode 100644
index 0000000..19ea6d8
--- /dev/null
+++ b/file-roller-3.40.0+51.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:076d25816b5ade7402bfaf6dc74bdd7ca8c3d71cf0889e1fe0ecf82edf3a97cd
+size 7764493
diff --git a/file-roller-3.40.0.tar.xz b/file-roller-3.40.0.tar.xz
deleted file mode 100644
index 42691bb..0000000
--- a/file-roller-3.40.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4a2886a3966200fb0a9cbba4e2b79f8dad9d26556498aacdaed71775590b3c0d
-size 876424
diff --git a/file-roller.changes b/file-roller.changes
index 2fe8ac1..2a68d2a 100644
--- a/file-roller.changes
+++ b/file-roller.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Jan 15 21:25:12 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 3.40.0+51:
+  + Updated translations.
+- Switch to git checkout via source service as upstream is not
+  doing releases. We want the updated translations.
+- Replace p7zip-full with 7zip following packaging changes of 7zip.
+
 -------------------------------------------------------------------
 Thu Nov  4 14:59:13 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/file-roller.obsinfo b/file-roller.obsinfo
new file mode 100644
index 0000000..8f0965d
--- /dev/null
+++ b/file-roller.obsinfo
@@ -0,0 +1,4 @@
+name: file-roller
+version: 3.40.0+51
+mtime: 1640162964
+commit: 5df34c7697a09b6b51b9241a05984e8c8a2c24e5
diff --git a/file-roller.spec b/file-roller.spec
index edc89e9..4b71ff0 100644
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package file-roller
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,16 @@
 
 
 Name:           file-roller
-Version:        3.40.0
+Version:        3.40.0+51
 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.40/%{name}-%{version}.tar.xz
+# Disabled as we are using a git checkout via source service
+#Source0:        https://download.gnome.org/sources/file-roller/3.40/%%{name}-%%{version}.tar.xz
+Source0:        %{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.
@@ -31,6 +34,7 @@ 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
 BuildRequires:  file-devel
@@ -46,9 +50,9 @@ BuildRequires:  pkgconfig(libnautilus-extension)
 BuildRequires:  pkgconfig(libnotify) >= 0.4.3
 # Formats that we likely want to support by default
 Recommends:     bzip2
+Recommends:     7zip
 Recommends:     cpio
 Recommends:     gzip
-Recommends:     p7zip-full
 Recommends:     rpm
 Recommends:     unar
 Recommends:     unzip