Accepting request 922761 from Office

OBS-URL: https://build.opensuse.org/request/show/922761
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnucash?expand=0&rev=93

285017793d2c0c9f5a8d52b3db42944480e3f557.patch

@@ -0,0 +1,24 @@
+From 285017793d2c0c9f5a8d52b3db42944480e3f557 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls@ceridwen.us>
+Date: Wed, 29 Sep 2021 10:35:19 -0700
+Subject: [PATCH] Use plain cat instead of cmake -E cat to join the
+ migratable-prefs.
+
+Cmake -E's cat is too new.
+---
+ gnucash/gschemas/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gnucash/gschemas/CMakeLists.txt b/gnucash/gschemas/CMakeLists.txt
+index 63da362f47..8b81a01614 100644
+--- a/gnucash/gschemas/CMakeLists.txt
++++ b/gnucash/gschemas/CMakeLists.txt
+@@ -29,7 +29,7 @@ set(gschema_migration_files ${local_migration_files} CACHE INTERNAL "gschema mig
+ # Provide gnucash runtime with a list of migratable preferences
+ add_custom_command(
+     OUTPUT ${DATADIR_BUILD}/${PROJECT_NAME}/migratable-prefs.xml
+-    COMMAND ${CMAKE_COMMAND} -E cat ${gschema_migration_files} > ${DATADIR_BUILD}/${PROJECT_NAME}/migratable-prefs.xml
++    COMMAND cat ${gschema_migration_files} > ${DATADIR_BUILD}/${PROJECT_NAME}/migratable-prefs.xml
+     DEPENDS ${gschema_migration_files}
+ )
+ 

gnucash-4.6.tar.bz2

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

gnucash-4.8.tar.bz2

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

gnucash.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Fri Oct  1 12:48:54 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to 4.8
+  + Compatibility Notice:
+    In order to allow flatpak users to share preferences with
+    installations outside of the sandbox we need to change the
+    preference path from /org/gnucash to /org/gnucash/GnuCash. This
+    release of GnuCash does that and it will automatically migrate
+    existing preferences. It does not, however, continue to write
+    preferences to the old path and it runs the migration only
+    once. If you go back and forth between GnuCash 4.7 and an older
+    versions you'll have two sets of preferences, one for GnuCash
+    4.7 and later and another for GnuCash 4.6 and earlier. This
+    includes the file history list and last-opened file.
+  + Bugfixes
+  + Updated translations.
+- Add 285017793d2c0c9f5a8d52b3db42944480e3f557.patch: Use plain cat
+  instead of cmake -E cat to join the migratable-prefs. Fixes build
+  for everything older than current Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jun 28 06:10:56 UTC 2021 - Johannes Engel <jcnengel@gmail.com>
 

gnucash.spec

@@ -28,7 +28,7 @@
 %endif
 
 Name:           gnucash
-Version:        4.6
+Version:        4.8
 Release:        0
 Summary:        Personal Finance Manager
 License:        SUSE-GPL-2.0-with-openssl-exception OR SUSE-GPL-3.0-with-openssl-exception
@@ -43,6 +43,9 @@ Patch0:         gnucash-cpan-warning.patch
 Patch1:         gnucash-libm.patch
 Patch2:         gnucash-4.1-fix-gtest-path.patch
 
+# PATCH-FIX-UPSTREAM 285017793d2c0c9f5a8d52b3db42944480e3f557.patch -- Use plain cat instead of cmake -E cat to join the migratable-prefs.
+Patch3:         https://github.com/Gnucash/gnucash/commit/285017793d2c0c9f5a8d52b3db42944480e3f557.patch
+
 BuildRequires:  boost-devel >= 1.60.0
 BuildRequires:  cmake >= 3.5
 BuildRequires:  doxygen