- up to 4.9

diff --git a/285017793d2c0c9f5a8d52b3db42944480e3f557.patch b/285017793d2c0c9f5a8d52b3db42944480e3f557.patch
deleted file mode 100644 (file)
index 8a96642..0000000
--- a/285017793d2c0c9f5a8d52b3db42944480e3f557.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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}
- )
-

diff --git a/gnucash.spec b/gnucash.spec
index 619222c68966a220f1f0fac7f2bec824f51b0257..c5a0947291bf2efb367fabade188cdf175a4291f 100644 (file)
--- a/gnucash.spec
+++ b/gnucash.spec
@@ -21,13 +21,12 @@ Summary(pl.UTF-8):  GnuCash - aplikacja do zarządzania twoimi finansami
 Summary(pt_BR.UTF-8):  O GnuCash é uma aplicação para acompanhamento de suas finanças
 Summary(zh_CN.UTF-8):  GnuCash - 您的个人财务管理软件
 Name:          gnucash
 Summary(pt_BR.UTF-8):  O GnuCash é uma aplicação para acompanhamento de suas finanças
 Summary(zh_CN.UTF-8):  GnuCash - 您的个人财务管理软件
 Name:          gnucash

-Version:       4.8
+Version:       4.9

 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       https://sourceforge.net/projects/gnucash/files/gnucash%20%28stable%29/%{version}/%{name}-%{version}.tar.bz2
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       https://sourceforge.net/projects/gnucash/files/gnucash%20%28stable%29/%{version}/%{name}-%{version}.tar.bz2

-# Source0-md5: bd8254441065ea53018999c7ffef7878
-Patch0:                285017793d2c0c9f5a8d52b3db42944480e3f557.patch
+# Source0-md5: 50747ca64f90568b9280f8797f2d2512

 URL:           http://www.gnucash.org/
 BuildRequires: boost-devel >= 1.60.0
 BuildRequires: cmake >= 3.5
 URL:           http://www.gnucash.org/
 BuildRequires: boost-devel >= 1.60.0
 BuildRequires: cmake >= 3.5


@@ -131,7 +130,7 @@ Pliki nagłówkowe bibliotek GnuCash.
 
 %prep
 %setup -q
 
 %prep
 %setup -q

-%patch0 -p1
+#%patch0 -p1

 
 %build
 install -d build
 
 %build
 install -d build


@@ -309,7 +308,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/ui
 %{_datadir}/%{name}/pixmaps
 %{_datadir}/metainfo/gnucash.appdata.xml
 %{_datadir}/%{name}/ui
 %{_datadir}/%{name}/pixmaps
 %{_datadir}/metainfo/gnucash.appdata.xml

-%{_datadir}/%{name}/migratable-prefs.xml
+%{_datadir}/%{name}/pref_transformations.xml

 %dir %{_datadir}/guile/site/%{guile_version}
 %{_datadir}/guile/site/%{guile_version}/%{name}
 %{_mandir}/man1/gnc-fq-dump.1*
 %dir %{_datadir}/guile/site/%{guile_version}
 %{_datadir}/guile/site/%{guile_version}/%{name}
 %{_mandir}/man1/gnc-fq-dump.1*