- up to 7.2.6.2

- removed obsolete bison3.8,kf5-detect patches
- added poppler patch (fixes build with poppler up to 22.04)
- ui-previewer no longer installed
- more locales to package: ckb, fur

diff --git a/bison3.8.patch b/bison3.8.patch
deleted file mode 100644 (file)
index e2b943a..0000000
--- a/bison3.8.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Tue, 14 Sep 2021 12:20:48 +0200
-Subject: [PATCH] Adapt to Bison 3.8 internal yyn -> yyrule rename
-
-see
-<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=f30067ed51f23802fc91761ede1506dfa72b2865>
-"glr2.cc: log the execution of deferred actions" including "Rename argument yyn
-as yyrule for clarity."
-
-YYBISON was defined as 1 rather than as a representation of the Bison version
-prior to
-<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=21c147b6e5372563b7c4741deadaddb9354f4b09>
-"yacc.c: provide the Bison version as an integral macro", which shouldn't be a
-problem here.  And YYBISON is apparently completely undefined with
-/usr/bin/bison on macOS.
-
-(The preceding comment always mentioned "yyi" and "yyrmap" in apparent mismatch
-with the actually used "yyn" and "yyr1" ever since
-c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just leave it
-untouched.)
-
-Change-Id: I4f901407aa21ed4abec84e661d813ee7599f02f0
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122082
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
----
- connectivity/source/parse/sqlbison.y | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
-index d14f36e7794f0..c4be0bc00bd04 100644
---- a/connectivity/source/parse/sqlbison.y
-+++ b/connectivity/source/parse/sqlbison.y
-@@ -74,9 +74,15 @@ inline connectivity::OSQLInternalNode* newNode(const OUString& _newValue,
- 
- // yyi is the internal number of the rule that is currently being reduced
- // This can be mapped to external rule number via the yyrmap.
-+#if defined YYBISON && YYBISON >= 30800
-+#define SQL_NEW_RULE                  newNode("", SQLNodeType::Rule, yyr1[yyrule])
-+#define SQL_NEW_LISTRULE              newNode("", SQLNodeType::ListRule, yyr1[yyrule])
-+#define SQL_NEW_COMMALISTRULE   newNode("", SQLNodeType::CommaListRule, yyr1[yyrule])
-+#else
- #define SQL_NEW_RULE                  newNode("", SQLNodeType::Rule, yyr1[yyn])
- #define SQL_NEW_LISTRULE              newNode("", SQLNodeType::ListRule, yyr1[yyn])
- #define SQL_NEW_COMMALISTRULE   newNode("", SQLNodeType::CommaListRule, yyr1[yyn])
-+#endif
- 
- 
- extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;

diff --git a/kf5-detect.patch b/kf5-detect.patch
deleted file mode 100644 (file)
index b8fa952..0000000
--- a/kf5-detect.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- libreoffice-7.2.0.3/configure.ac~  2021-08-10 19:27:48.000000000 +0200
-+++ libreoffice-7.2.0.3/configure.ac   2022-03-29 13:09:30.740802677 +0200
-@@ -12759,7 +12759,8 @@
-         kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
-     fi
- 
--    kf5_test_include="KF5/kcoreaddons_version.h"
-+    kf5_test_include_old="KF5/kcoreaddons_version.h"
-+    kf5_test_include="KF5/KCoreAddons/kcoreaddons_version.h"
-     kf5_test_library="libKF5CoreAddons.so"
-     kf5_libdirs="$qt5_libdir $kf5_libdirs"
- 
-@@ -12774,6 +12775,10 @@
-     AC_MSG_CHECKING([for KF5 headers])
-     kf5_incdir="no"
-     for kf5_check in $kf5_incdirs; do
-+        if test -r "$kf5_check/$kf5_test_include_old"; then
-+            kf5_incdir="$kf5_check/KF5"
-+            break
-+        fi
-         if test -r "$kf5_check/$kf5_test_include"; then
-             kf5_incdir="$kf5_check/KF5"
-             break

diff --git a/libreoffice.spec b/libreoffice.spec
index 875c0f8d5e7c810c30650b18c9bf3ee9f5f03c07..ae112f47a3465f804b2e24e353bb337aec1c4615 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -54,7 +54,7 @@
 %define                with_qt5        1
 %endif
 
-%define                major_ver       7.2.0
+%define                major_ver       7.2.6
 %define                qt5_ver         5.6
 
 %define                use_jdk         openjdk11
@@ -62,18 +62,18 @@
 Summary:       LibreOffice - powerful office suite
 Summary(pl.UTF-8):     LibreOffice - potężny pakiet biurowy
 Name:          libreoffice
-Version:       %{major_ver}.3
-Release:       4
+Version:       %{major_ver}.2
+Release:       1
 License:       GPL/LGPL
 Group:         X11/Applications
 Source0:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz
-# Source0-md5: 2e994b22a38dfd4e76d90552566ad533
+# Source0-md5: 9e8f5362f6296b4760353f4402640316
 Source1:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
-# Source1-md5: a92d627c04334cb56f9b722e1e2be78c
+# Source1-md5: 7d30cd012a80d825bdf6b5c1fcb5dde3
 Source2:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
-# Source2-md5: 70a9677a664e4ed0153524e803cea16e
+# Source2-md5: 1661e10d0a866a6f6ba4d6b33958dbe1
 Source3:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
-# Source3-md5: 30537a2522c857b024a8f7309bba4fdd
+# Source3-md5: 87f5abe3030562e93e6bee392c36656f
 
 # make (download|fetch) DO_FETCH_TARBALLS=1 WGET=wget
 # but not sure if all are needed?
@@ -109,9 +109,8 @@ Source34:   skia-freetype2.11.patch
 
 Patch0:                disable-failing-test.patch
 Patch1:                pld-skia-patches.patch
-Patch2:                bison3.8.patch
-Patch3:                kf5-detect.patch
-URL:           http://www.documentfoundation.org/
+Patch2:                %{name}-poppler.patch
+URL:           https://www.documentfoundation.org/
 BuildRequires: /usr/bin/getopt
 %{?with_firebird:BuildRequires:        Firebird-devel >= 3.0.0.0}
 BuildRequires: GLM
@@ -2858,7 +2857,6 @@ oraz narzędzie ui-previewer do sprawdzania wyglądu okien dialogowych.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 for dir in *-%{version}; do
        [ -f $dir/ChangeLog ] && %{__mv} $dir/ChangeLog ChangeLog-$dir
@@ -4055,6 +4053,7 @@ fi
 %{_libdir}/%{name}/program/officehelper.py
 %{_libdir}/%{name}/program/pythonloader.py
 %{_libdir}/%{name}/program/pythonscript.py
+%{_libdir}/%{name}/program/scriptforge.py
 %{_libdir}/%{name}/program/uno.py
 %{_libdir}/%{name}/program/unohelper.py
 %{_libdir}/%{name}/program/services/pyuno.rdb
@@ -4485,6 +4484,5 @@ fi
 
 %files glade
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/program/ui-previewer
 %dir %{_datadir}/%{name}/share/glade
 %{_datadir}/%{name}/share/glade/libreoffice-catalog.xml