From 318b7f1aa388ad02250e15049a34832bac1bb006452629978ba43fc460a377b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Mon, 30 Sep 2024 08:02:55 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=402

---
 _service                       |  4 ++--
 _servicedata                   |  4 ++++
 nautilus-47.0+8.obscpio        |  3 +++
 nautilus-47.0.obscpio          |  3 ---
 nautilus.changes               | 14 ++++++++++++++
 nautilus.obsinfo               |  6 +++---
 nautilus.spec                  |  5 ++++-
 revert-post-release-bump.patch | 24 ++++++++++++++++++++++++
 8 files changed, 54 insertions(+), 9 deletions(-)
 create mode 100644 _servicedata
 create mode 100644 nautilus-47.0+8.obscpio
 delete mode 100644 nautilus-47.0.obscpio
 create mode 100644 revert-post-release-bump.patch

diff --git a/_service b/_service
index 8f6f82d..7dfedce 100644
--- a/_service
+++ b/_service
@@ -3,11 +3,11 @@
   <service name="obs_scm" mode="manual">
     <param name="scm">git</param>
     <param name="url">https://gitlab.gnome.org/GNOME/nautilus.git</param>
-    <param name="revision">47.0</param>
+    <param name="revision">88b8f9d5baaa14ebd20252f7a9879a52448ebc20</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
     <param name="versionrewrite-pattern">(.*)\+0</param>
     <param name="versionrewrite-replacement">\1</param>
-<!--    <param name="changesgenerate">enable</param> -->
+    <param name="changesgenerate">enable</param>
   </service>
   <service name="tar" mode="buildtime"/>
   <service name="recompress" mode="buildtime">
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..2c82128
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">https://gitlab.gnome.org/GNOME/nautilus.git</param>
+              <param name="changesrevision">88b8f9d5baaa14ebd20252f7a9879a52448ebc20</param></service></servicedata>
\ No newline at end of file
diff --git a/nautilus-47.0+8.obscpio b/nautilus-47.0+8.obscpio
new file mode 100644
index 0000000..f671e55
--- /dev/null
+++ b/nautilus-47.0+8.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28335e8279ed54b6c9ac2f06b5a193aa64da1ebcfc8d10b3f605e741337d833e
+size 33310221
diff --git a/nautilus-47.0.obscpio b/nautilus-47.0.obscpio
deleted file mode 100644
index 28d9b91..0000000
--- a/nautilus-47.0.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6ee383c394c6e798f221555987bc307562899372adaad8ee7ffe590fcf4ecf4b
-size 33298957
diff --git a/nautilus.changes b/nautilus.changes
index d6fac03..593484f 100644
--- a/nautilus.changes
+++ b/nautilus.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Sep 27 17:36:06 UTC 2024 - bjorn.lie@gmail.com
+
+- Update to version 47.0+8:
+  * sidebarrow: Add appropriate margin and opacity
+  * list-base: Fix scroll to zoom
+  * list-base: Don't scroll when the ctrl key is held
+  * contributing: Add a CONTRIBUTING.md file
+  * gschema: Revert accidental new translatable strings
+  * Updated translations.
+- Add revert-post-release-bump.patch: Since we are using a
+  gitcheckout, the metadata fails during tests if we do not set a
+  proper iso-date.
+
 -------------------------------------------------------------------
 Sun Sep 15 14:58:42 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/nautilus.obsinfo b/nautilus.obsinfo
index 01c19cd..de1330d 100644
--- a/nautilus.obsinfo
+++ b/nautilus.obsinfo
@@ -1,4 +1,4 @@
 name: nautilus
-version: 47.0
-mtime: 1726410011
-commit: 97d2db4fb0254142306e6ff7ce5311a8faaabbd8
+version: 47.0+8
+mtime: 1726507392
+commit: 88b8f9d5baaa14ebd20252f7a9879a52448ebc20
diff --git a/nautilus.spec b/nautilus.spec
index 624cb1c..5f0db66 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -17,7 +17,7 @@
 
 
 Name:           nautilus
-Version:        47.0
+Version:        47.0+8
 Release:        0
 Summary:        File Manager for the GNOME Desktop
 License:        GPL-3.0-or-later AND LGPL-2.1-or-later
@@ -27,6 +27,9 @@ Source0:        %{name}-%{version}.tar.zst
 Source1:        set_trusted.desktop
 Source2:        set_trusted.sh
 
+# PATCH-FIX-OPENSUSE revert-post-release-bump.patch -- Allow us to ship a git checkout, drop on next stable bump
+Patch:          revert-post-release-bump.patch
+
 # needed for directory ownership
 BuildRequires:  dbus-1
 BuildRequires:  fdupes
diff --git a/revert-post-release-bump.patch b/revert-post-release-bump.patch
new file mode 100644
index 0000000..d54477b
--- /dev/null
+++ b/revert-post-release-bump.patch
@@ -0,0 +1,24 @@
+diff -Nur nautilus/data/org.gnome.Nautilus.metainfo.xml.in.in patched-nautilus/data/org.gnome.Nautilus.metainfo.xml.in.in
+--- nautilus/data/org.gnome.Nautilus.metainfo.xml.in.in	2024-09-27 19:35:59.251268108 +0200
++++ patched-nautilus/data/org.gnome.Nautilus.metainfo.xml.in.in	2024-09-28 10:18:24.361946027 +0200
+@@ -40,7 +40,7 @@
+     <release version="@release-version@" date="@build-date@"/>
+   -->
+   <releases>
+-    <release version="@release-version@" date="@build-date@"/>
++    <release version="@release-version@" type="stable" date="2024-09-28"/>
+   </releases>
+   <project_group>GNOME</project_group>
+   <project_license>GPL-3.0-or-later</project_license>
+diff -Nur nautilus/meson.build patched-nautilus/meson.build
+--- nautilus/meson.build	2024-09-27 19:36:06.654623675 +0200
++++ patched-nautilus/meson.build	2024-09-28 09:58:33.792262099 +0200
+@@ -3,7 +3,7 @@
+ 
+   # Do not forget when releasing:
+   #  * Set release date in data/org.gnome.Nautilus.metainfo.xml.in.in
+-  version: '47.1',
++  version: '47.0',
+ 
+   meson_version: '>= 0.59.0',
+   license: 'GPL-3.0-or-later'