From da543a716d33df06f9241a07547f4dc4cfdacac2f8e744e1692452950ce77b8c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 11 Mar 2024 19:41:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1146 --- 0001-Allow-building-with-Java-8.patch | 174 ------------------- gpgme-1.20.0.tar.bz2 | 3 - gpgme-1.23.2.tar.bz2 | 3 + libreoffice-24.2.1.2.tar.xz | 3 - libreoffice-24.2.1.2.tar.xz.asc | 16 -- libreoffice-24.2.2.1.tar.xz | 3 + libreoffice-24.2.2.1.tar.xz.asc | 16 ++ libreoffice-help-24.2.1.2.tar.xz | 3 - libreoffice-help-24.2.1.2.tar.xz.asc | 16 -- libreoffice-help-24.2.2.1.tar.xz | 3 + libreoffice-help-24.2.2.1.tar.xz.asc | 16 ++ libreoffice-translations-24.2.1.2.tar.xz | 3 - libreoffice-translations-24.2.1.2.tar.xz.asc | 16 -- libreoffice-translations-24.2.2.1.tar.xz | 3 + libreoffice-translations-24.2.2.1.tar.xz.asc | 16 ++ libreoffice.spec | 9 +- 16 files changed, 63 insertions(+), 240 deletions(-) delete mode 100644 0001-Allow-building-with-Java-8.patch delete mode 100644 gpgme-1.20.0.tar.bz2 create mode 100644 gpgme-1.23.2.tar.bz2 delete mode 100644 libreoffice-24.2.1.2.tar.xz delete mode 100644 libreoffice-24.2.1.2.tar.xz.asc create mode 100644 libreoffice-24.2.2.1.tar.xz create mode 100644 libreoffice-24.2.2.1.tar.xz.asc delete mode 100644 libreoffice-help-24.2.1.2.tar.xz delete mode 100644 libreoffice-help-24.2.1.2.tar.xz.asc create mode 100644 libreoffice-help-24.2.2.1.tar.xz create mode 100644 libreoffice-help-24.2.2.1.tar.xz.asc delete mode 100644 libreoffice-translations-24.2.1.2.tar.xz delete mode 100644 libreoffice-translations-24.2.1.2.tar.xz.asc create mode 100644 libreoffice-translations-24.2.2.1.tar.xz create mode 100644 libreoffice-translations-24.2.2.1.tar.xz.asc diff --git a/0001-Allow-building-with-Java-8.patch b/0001-Allow-building-with-Java-8.patch deleted file mode 100644 index bb157c8..0000000 --- a/0001-Allow-building-with-Java-8.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 23b6064d830de573a50dcbc480c54b58dcf99e5a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= -Date: Fri, 1 Mar 2024 13:36:42 +0100 -Subject: [PATCH] Allow building with Java 8 - -Change-Id: Ib1af1a98993aabb8a03f4ef19d8da4d9a71fdbc0 ---- - config_host.mk.in | 1 + - configure.ac | 20 +++++++++++++++----- - ridljar/Jar_libreoffice.mk | 6 +++--- - ridljar/Jar_unoloader.mk | 8 ++++---- - solenv/gbuild/JavaClassSet.mk | 6 +++--- - 5 files changed, 26 insertions(+), 15 deletions(-) - -diff --git a/config_host.mk.in b/config_host.mk.in -index 04745d508fc3..00dc7aa1f898 100644 ---- a/config_host.mk.in -+++ b/config_host.mk.in -@@ -483,6 +483,7 @@ export MERGELIBS_MORE=@MERGELIBS_MORE@ - export ML_EXE=@ML_EXE@ - export MOC5=@MOC5@ - export MOC6=@MOC6@ -+MODULAR_JAVA=@MODULAR_JAVA@ - export MPL_SUBSET=@MPL_SUBSET@ - export MSGFMT=@MSGFMT@ - export MSGUNIQ=@MSGUNIQ@ -diff --git a/configure.ac b/configure.ac -index dd4ed7107aa8..b218120773d1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2570,7 +2570,7 @@ AC_ARG_WITH(linker-hash-style, - - AC_ARG_WITH(jdk-home, - AS_HELP_STRING([--with-jdk-home=], -- [If you have installed JDK 17 or later on your system please supply the -+ [If you have installed JDK 8 or later on your system please supply the - path here. Note that this is not the location of the java command but the - location of the entire distribution. In case of cross-compiling, this - is the JDK of the host os. Use --with-build-platform-configure-options -@@ -8647,7 +8647,7 @@ if test "$ENABLE_JAVA" != ""; then - fi - - if ! test -f "$with_jdk_home/lib/jvm.lib" -a -f "$with_jdk_home/bin/java.exe"; then -- AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option (or fix the path) pointing to a $WIN_HOST_BITS-bit JDK >= 17]) -+ AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option (or fix the path) pointing to a $WIN_HOST_BITS-bit JDK >= 8]) - fi - fi - -@@ -8712,6 +8712,7 @@ dnl =================================================================== - # Whether all the complexity here actually is needed any more or not, no idea. - - JDK_SECURITYMANAGER_DISALLOWED= -+MODULAR_JAVA= - if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then - _gij_longver=0 - AC_MSG_CHECKING([the installed JDK]) -@@ -8732,8 +8733,8 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then - _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED '/^$/d' | $SED s/[[-A-Za-z]]*//` - _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` - -- if test "$_jdk_ver" -lt 170000; then -- AC_MSG_ERROR([JDK is too old, you need at least 17 ($_jdk_ver < 170000)]) -+ if test "$_jdk_ver" -lt 10800; then -+ AC_MSG_ERROR([JDK is too old, you need at least 8 ($_jdk_ver < 10800)]) - fi - dnl TODO: Presumably, the Security Manager will not merely be disallowed, but be - dnl completely removed in some Java version > 18 (see -@@ -8748,13 +8749,21 @@ if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then - fi - AC_MSG_RESULT([found $JAVA_HOME (JDK $_jdk)]) - -+ dnl Check whether the build Java supports modules -+ if test "$_jdk_ver" -ge 90000; then -+ MODULAR_JAVA=TRUE -+ else -+ AC_MSG_WARN([Modular jars will not be built. They need at least Java 9 ($_jdk_ver < 90000)]) -+ add_warning "Modular jars will not be built. They need at least Java 9 ($_jdk_ver < 90000)" -+ fi -+ - # set to limit VM usage for JunitTests - JAVAIFLAGS=-Xmx64M - # set to limit VM usage for javac - JAVACFLAGS=-J-Xmx128M - fi - else -- AC_MSG_ERROR([Java not found. You need at least JDK 17]) -+ AC_MSG_ERROR([Java not found. You need at least JDK 8]) - fi - else - if test -z "$ENABLE_JAVA"; then -@@ -9058,6 +9067,7 @@ AC_SUBST(JDK_FOR_BUILD) - AC_SUBST(JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD) - AC_SUBST(JAVA_SOURCE_VER) - AC_SUBST(JAVA_TARGET_VER) -+AC_SUBST(MODULAR_JAVA) - - - dnl =================================================================== -diff --git a/ridljar/Jar_libreoffice.mk b/ridljar/Jar_libreoffice.mk -index 76a56eedc078..77397bc246ee 100644 ---- a/ridljar/Jar_libreoffice.mk -+++ b/ridljar/Jar_libreoffice.mk -@@ -36,12 +36,12 @@ $(eval $(call gb_Jar_add_manifest_classpath,libreoffice, \ - $(eval $(call gb_Jar_add_packagedirs,libreoffice,\ - $(call gb_CustomTarget_get_workdir,ridljar/javamaker)/com \ - $(call gb_CustomTarget_get_workdir,unoil/javamaker)/com \ -- $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,libreoffice))/module-info.class \ -+ $(if $(MODULAR_JAVA),$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,libreoffice))/module-info.class) \ - )) - --$(eval $(call gb_Jar_add_sourcefiles_java9,libreoffice,\ -+$(if $(MODULAR_JAVA),$(eval $(call gb_Jar_add_sourcefiles_java9,libreoffice,\ - ridljar/source/libreoffice/module-info \ --)) -+))) - - $(eval $(call gb_Jar_add_sourcefiles,libreoffice,\ - ridljar/com/sun/star/comp/bridgefactory/BridgeFactory \ -diff --git a/ridljar/Jar_unoloader.mk b/ridljar/Jar_unoloader.mk -index 2acf20b5b289..b7fcbc105dc1 100644 ---- a/ridljar/Jar_unoloader.mk -+++ b/ridljar/Jar_unoloader.mk -@@ -14,13 +14,13 @@ $(eval $(call gb_Jar_set_packageroot,unoloader,com)) - $(eval $(call gb_Jar_set_manifest,unoloader,$(SRCDIR)/ridljar/source/unoloader/com/sun/star/lib/unoloader/manifest)) - - # the module-info.class is manually added here since it's not in "com" dir --$(eval $(call gb_Jar_add_packagedirs,unoloader,\ -+$(if $(MODULAR_JAVA),$(eval $(call gb_Jar_add_packagedirs,unoloader,\ - $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,unoloader))/module-info.class \ --)) -+))) - --$(eval $(call gb_Jar_add_sourcefiles_java9,unoloader,\ -+$(if $(MODULAR_JAVA),$(eval $(call gb_Jar_add_sourcefiles_java9,unoloader,\ - ridljar/source/unoloader/module-info \ --)) -+))) - - $(eval $(call gb_Jar_add_sourcefiles,unoloader,\ - ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoClassLoader \ -diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk -index 84fbcc13c32d..8acf120dd615 100644 ---- a/solenv/gbuild/JavaClassSet.mk -+++ b/solenv/gbuild/JavaClassSet.mk -@@ -19,7 +19,7 @@ - - gb_JavaClassSet_JAVACCOMMAND = $(ICECREAM_RUN) $(JAVACOMPILER) $(JAVACFLAGS) \ - -encoding utf8 \ -- --release $(1) \ -+ $(if $(MODULAR_JAVA),--release $(1),-source $(1) -target $(1)) \ - -Xlint:-options \ - -Xlint:unchecked - -@@ -51,7 +51,7 @@ $(call gb_Helper_abbreviate_dirs,\ - -d $(call gb_JavaClassSet_get_classdir,$(2)) \ - @$$RESPONSEFILE &&) \ - rm -f $$RESPONSEFILE &&) \ -- $(if $(T_MODULENAME),\ -+ $(if $(MODULAR_JAVA),$(if $(T_MODULENAME),\ - RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\ - $(T_JAVA9FILES)) && \ - $(if $(3),$(call gb_JavaClassSet_JAVACCOMMAND,9) \ -@@ -61,7 +61,7 @@ $(call gb_Helper_abbreviate_dirs,\ - $(if $(T_MODULENAME),--patch-module $(T_MODULENAME)="$(subst $(WHITESPACE),$(gb_CLASSPATHSEP),$(strip $(dir $(PACKAGEDIRS))))") \ - -d $(call gb_JavaClassSet_get_classdir,$(2)) \ - @$$RESPONSEFILE &&) \ -- rm -f $$RESPONSEFILE &&) \ -+ rm -f $$RESPONSEFILE &&)) \ - touch $(1)) - - endef --- -2.44.0 - diff --git a/gpgme-1.20.0.tar.bz2 b/gpgme-1.20.0.tar.bz2 deleted file mode 100644 index e54e7a1..0000000 --- a/gpgme-1.20.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750 -size 1817377 diff --git a/gpgme-1.23.2.tar.bz2 b/gpgme-1.23.2.tar.bz2 new file mode 100644 index 0000000..1a261ef --- /dev/null +++ b/gpgme-1.23.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224 +size 1836904 diff --git a/libreoffice-24.2.1.2.tar.xz b/libreoffice-24.2.1.2.tar.xz deleted file mode 100644 index 8e206a7..0000000 --- a/libreoffice-24.2.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ccf577e8f665059ed5a06577b3b37278080be9f29cc4ad3352857a8f2549fa8 -size 280349652 diff --git a/libreoffice-24.2.1.2.tar.xz.asc b/libreoffice-24.2.1.2.tar.xz.asc deleted file mode 100644 index 20d0f0a..0000000 --- a/libreoffice-24.2.1.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmXbY/MACgkQ9DSh76/u -rqNtGg/8DSbKvnTtt4A4hUZrIY5PISmBTo/DIYN7JgUkAQBxDMJrUWt0Y9Tz5c4c -eyZ69YoZd9WGbHejEbdMUt1eqSyEM16aVuNXC+HjXEXlJBKRYRsRc4hLl6hk4vVt -rYcwFZlpUz+VgItgzTMBpoT8rAfIcAgnmzc2jfPweJy3HQFVWcK/na4x40zbihe2 -5UJugEjrgXxbAwAuvtl2YnnUe2SfbpW503Cjsnhv0KU8cn3unVfy/OBtzIUvkVMW -obY1ZYduHXZGO4kz9utwHytkDAYX21ExzMieIp8XlWKezHkSdNYIrKTVsBLYbmF8 -6V44MI+nd+aqGF0yVPfhUhwjs5/N7bBcDsrj9gvKd1+g7j0+afgUoYWYJRn+K2Is -k5Xdarxita64DidZ6qNMBSiSHnxhGuiIGQ+gfs12+oS+rIWxNGknRzxlDTEZps5h -zOaEGPu3FnKUEOMdOG+TkrWYlBO61yIVXV4HrW7WLv0l5cuGvno9L3AdTlPJisP4 -AYNIUIJ3XVa5yLFlvvXjZ4thSUxGD/NOCHMAiT9ia5Ih2JRAn55UUDISb9Yqv/dE -gVOAaajF+iGg4FWZsTln2kdyWd4RYPJe3CgOLirjw3SxSxGmr6WIBRs42vkzhcGb -cXlV69ZVTd2SPDmMPQAq8YIG9bG5kulsnOpd0rYnaSHBX8UWCUA= -=MtQd ------END PGP SIGNATURE----- diff --git a/libreoffice-24.2.2.1.tar.xz b/libreoffice-24.2.2.1.tar.xz new file mode 100644 index 0000000..8f4e3c5 --- /dev/null +++ b/libreoffice-24.2.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27ead9b159cb0f9ad884877f365bf177c0c5c853fa1e25003861ac6a87a861d6 +size 280628072 diff --git a/libreoffice-24.2.2.1.tar.xz.asc b/libreoffice-24.2.2.1.tar.xz.asc new file mode 100644 index 0000000..f4decd0 --- /dev/null +++ b/libreoffice-24.2.2.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmXpp4IACgkQ9DSh76/u +rqNySxAAoMRoCZyWx6+62LXKoJErPFJ6vEnKhf293UgK1jac7uyWZDItuzW60XhT +UAnF1CGz7wgYV89fPkBLXRQSpKZEGSBOE7uOB3lUOoF7lLqH3NwyBBGDiF6Qf198 +XrQHpuVfTN9WuoTwOVmfnY5KbxRcsdetOoAKoNy1t7xmWToGwzkaaM2myqBvWJgM +1NaTx9NrK+hghmNEwX380gtBjunvyebvvPWvB+c7Hth3RQS4yVgwdsleYh/7MTdU +GLEqtVry+AahXj/X1Z2uUZhHctL4KDnQAPcy7PgzKBTmXHV5P3MfXFmUvCgHAta5 +rAIMUkW5FmW1TNrEbpZO0HzgxSCp7LFY69LWy0x7bKSZ/nm3X6e6t0+8ggWHvcI8 +MlKlKN+Lp8ErFAMME+4bWUvhJeGlw8lACFsCkZrZ0TrkpJ1sbPoRMM/2fLdZe3Xj +Lh9QTPlgmdi3HdOun/atdEMxEMBZdaFbR9NVfizh9OsoDFakZUIUOZxZFvgZEyCR +mogc2y+2HIYVt5gahHecPM/IbPL3BDngpvspgr833K/SwnpibEVq8YdY28mWreKu +y0Q0J+k4vAUetBz3xteZte/pyQqNtvLew8RjP4aGtCW1eU7/rwbaP7t2w58nlBqf +/r6fEnAfER9/rnc1IDlfZACq2cX3gvVSSq7HFbzynd5AO8tSIMc= +=fQwu +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-24.2.1.2.tar.xz b/libreoffice-help-24.2.1.2.tar.xz deleted file mode 100644 index 9dcebe1..0000000 --- a/libreoffice-help-24.2.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f8b03b1af94e72c8301164fbcb84c0af57ba6416be8ff02f7b7dd06ff4c2f74 -size 167070728 diff --git a/libreoffice-help-24.2.1.2.tar.xz.asc b/libreoffice-help-24.2.1.2.tar.xz.asc deleted file mode 100644 index b475daa..0000000 --- a/libreoffice-help-24.2.1.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmXbY/4ACgkQ9DSh76/u -rqORDQ/9EG1XL99NVfK4w5xQtRu8WiSWdxijB9/6sAOcUxBBSHHP3Sqtq83cJJqm -MH/0ap83DW7QMkUBPFccswn8OYmbr4HWAFneQMrHoQ3K1EpFV8lLuIwv38I/L0qP -YqLn08qvrGm/NJXytWwLZ0R5W82IaruhVtRTTllGZG19F85HgS+6vo7YBdO/YOGR -FmiyzQeRBUhgFagsuvo4spC2kvezsmnQbAxSgVP2gwk7vqmjfuexEewX0GOTUSGH -XOcSglb5dNuzmsIxeEj2KluydQoF36S49dD9Yk2lAjhou8dDmDimV3EeRdzssHJH -cR7vnQPR+Kj+FEI/dg1Yi93oiZDBoOkGMmGB+4BbTSu0yZfkPmIBFgYK8Gt1Zbum -mL2B+5Kb5xl2JZxOmd7+vqc5V9MNxHYwPIb7+DqXLakxEoGFV1IrZiDGw5WBisBf -fmDIxWB/AQnKe8VeHuuRYE6dSbYPQM6XkMpsWIvIEpg3YZR1m+JNNE8bcuPpRoM6 -ck6q6eTgEig2m1cyIbUIvUEybdf54A61iQ9xSfkYv0gaXbwV1XxoN6VvNR+KhOI6 -zhJoMhqeBeoe+d13CefL9B3rOpMpUAWjSew8iKSAFv3h354Ixv07Nlmid9zp+7TW -UPBsSJ+PH2DB/wJRGxq4ZMqsScY74QApySC35a1+kLE3sS64Ku8= -=+KS1 ------END PGP SIGNATURE----- diff --git a/libreoffice-help-24.2.2.1.tar.xz b/libreoffice-help-24.2.2.1.tar.xz new file mode 100644 index 0000000..fe8fdda --- /dev/null +++ b/libreoffice-help-24.2.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c435cedf2cc1791be0e1ed8e40ce5d291eb3868878031f9fa939a5821f1cc940 +size 167069480 diff --git a/libreoffice-help-24.2.2.1.tar.xz.asc b/libreoffice-help-24.2.2.1.tar.xz.asc new file mode 100644 index 0000000..6b32f5a --- /dev/null +++ b/libreoffice-help-24.2.2.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmXpp4sACgkQ9DSh76/u +rqOtnQ//YxE4MZVXLauoOfRxadz3PUyWpDqT+Ez2z4R9+YtmMclks+GfX7xwggb2 +a20KWmaDXiWL9CzJwJ89ovwoNAUdw/j+AhoSCQY4qNppv3Kkpn9SSUyDato6HJfm +3xEjyVM2YlAdC7uPJHkC5YrutUs5ymzd8miDC0bdKDHgQsNiYU74SrbLU2t0ySoT +WvKwpeg5XwMT7EUb8hyfovkOrcgJzVqGbSNEsqochAwwZ77uDrjskhrrp4lIm0iU +QWEijCFJNPKr+4uaM8U3oJm02TYG9GGsi7l6eBc1Gicx3BSxyIqJgDThwdU8KWpb +Hizk2mE3qAUWVyp/AL5RiLYdx1/CJTtBW1/eLzJAvFfdkZ1BZOn5rM498DfCtFdr +PZo8nApMHPjUbdDiv5DiBSlpkBNyI2ZXZ5bBqK4suuVybg9FjYn56hoLPsesxECU +VO77KTQVg2BoKETljLjcrDjYecxAoVurkNHNlKlzjCcjgf4r96ywkrYcRL2+6sRh +SiamCiNtMNU2w+4nF58mG0w1HphRmUj6iKtTAB725qFcVSHxaFFyXeUySyphHqxy +KjxBMJTfbr46EZHx0/3FjI6g5LfLMG/aaNHcpEu8SAsgqf0BA8yYp3ID2KY8U1x1 +j6Jiv5eTkkxAyB8hJB17zfY/KV1N/e+s7nZ4qKa/rqduYbr7L4s= +=KgEh +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-24.2.1.2.tar.xz b/libreoffice-translations-24.2.1.2.tar.xz deleted file mode 100644 index 683f7af..0000000 --- a/libreoffice-translations-24.2.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf5b164b5e8ac9f796dbc2cf1e9d30e345341d367f634852c47e4572a94f58e9 -size 220528884 diff --git a/libreoffice-translations-24.2.1.2.tar.xz.asc b/libreoffice-translations-24.2.1.2.tar.xz.asc deleted file mode 100644 index 9504e80..0000000 --- a/libreoffice-translations-24.2.1.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmXbY/8ACgkQ9DSh76/u -rqMpuA//Z1YXzLBaRMKTDgroIYUSb3MPy2qBm4NJ8ds1ZkkzkV4R0r4OSo0l3YrN -CaFTBWBVyJTExcSvAbUU4RuL7CRr5+ywFlM4BVkNNHU5YdCIzo62//wj1bzljc4Z -UGzvnnE85p9Jgk8ZLiNtd7KDEuhGQJ6RcwCDtx1nnvTsXMdUHrsEOn+gQsM44yoy -LAGP/AsbAXJDkzB1WIH98WAjykMjasFzQX7FN4KkyRaq9fPDJYP2RE4x9ziAYZ6q -dzLZjj4WX7OCjUw53QzoKbIxeefh4SUadrGhUJKd5ApLfL7cecohVrUIvmoYHxC6 -IIHYa96MnVBq4SPKbOR6i5D3A6f/yZk4Wsvo1Gk2QtdsvrjkSV66kcRGpzIEK7G9 -aoHnNSMsjdRtGtzoZ6Cc0K81M9ccOsjjGmJrTk6RCZC0jw7PAgjI68alqwe8ezCD -yTKqUbmyitwPwV45M1V0LcXW0wwsVLAWlCBQ1pEy+APHKyZslfyC/6D5CGlQmIQZ -Q/KE6jsNPK+dFyWGIfRGhOjQjG2ph/TReiGxa1gj2bktH05EOhJEaY/Z9slFTVNg -EK0nbVhUui9F/SeAA/K7rxDL3EPc4fWnJt5zuLIVtQxO4QtA3N3T/52ZhLigB9zV -79CtVvYZ0NwBl/OmeFJAMIGf9U6AYWAqUME55pLTfcE6JrE9+7E= -=uN5R ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-24.2.2.1.tar.xz b/libreoffice-translations-24.2.2.1.tar.xz new file mode 100644 index 0000000..6b20c3d --- /dev/null +++ b/libreoffice-translations-24.2.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0d7aafb6fe994086b5078f676bd63e4fc4b4084f2de488ff3d3a31f20016d3a +size 220610864 diff --git a/libreoffice-translations-24.2.2.1.tar.xz.asc b/libreoffice-translations-24.2.2.1.tar.xz.asc new file mode 100644 index 0000000..239460c --- /dev/null +++ b/libreoffice-translations-24.2.2.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmXpp4wACgkQ9DSh76/u +rqN1iBAAtCtG7u/IXrWdmcd5d1tXIzr/6m/2Yx1tqtloYbxXuvBqNW4GKLFiF1QK +Mxy/D0zMSirK+hVdp+OfztkYh9u0iL3PgRCnU/iCWy5bo13G1wPTtt1twXjBH+xE +B/B78Hr30pyoVhaC4ilEco0Ev4B3dR+F+qyuPyzJ6OeVM9YHfw526zZLdksICwiu +pzVuoPuuIK7k6goZBx4S+FmjCgutoxmBKvsZI41yjheNblC8mKocnOebFKjXPVOx +rJiS0tnomdrXK9G6Rivk7/WypG28eOuroZTTg3s2ZcRNudnf2PMuBPgjousTnNTZ +kmWwJPfs22wgoOwkY4/wnEgiIiuMQzvReTdlOyjC22JvwCPl3t1NmR/rXeVmufHY ++mFLsRoC9q9+bYLvt/HcKRlykLxnPVXKrhHK1D0niX4qjUIJHTXBMbav7gNCCbYi +qVXFC9oLws5mgG/jR7+JLLERzDiM/wfkflpVRvqvPP0MHaUq1cF8mfyepkcgFB4Y +5iWoekrI+krf+gY7Zcpdgx2Mdrc39OBP0tDxZoexJ25OyCwlbEScTBsi57Te38Jx +/vPPqA1AaUwz6SfumXRwaJac5chff5XoV6R98ApvQhqtG7UR0xPfq0G8an4+YLWU +7ZV4TVFP1cZni0J2irq0CcZNPN9YwbXz3J3REwdI3wNeP7/bAdc= +=hANw +-----END PGP SIGNATURE----- diff --git a/libreoffice.spec b/libreoffice.spec index f940bbd..00474fe 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -55,7 +55,7 @@ %global with_gcc 12 %endif Name: libreoffice -Version: 24.2.1.2 +Version: 24.2.2.1 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -117,8 +117,6 @@ Patch11: fix_webp_on_sle12_sp5.patch Patch14: use-fixmath-shared-library.patch # PATCH-FIX-SUSE Fix make distro-pack-install Patch15: fix-sdk-idl.patch -# Patch submitted upstream to allow building with any Java >= 8 -Patch100: 0001-Allow-building-with-Java-8.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep @@ -344,10 +342,10 @@ BuildRequires: python-rpm-macros %if %{with system_gpgme} BuildRequires: libgpgmepp-devel >= 1.14 %else -Source1000: %{external_url}/gpgme-1.20.0.tar.bz2 +Source1000: %{external_url}/gpgme-1.23.2.tar.bz2 Source1001: %{external_url}/libgpg-error-1.47.tar.bz2 Source1002: %{external_url}/libassuan-2.5.6.tar.bz2 -Provides: bundled(gpgme) = 1.20.0 +Provides: bundled(gpgme) = 1.23.2 Provides: bundled(libassuan) = 2.5.6 Provides: bundled(libgpg-error) = 1.47 %endif @@ -1033,7 +1031,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch -P 3 %patch -P 6 -p1 %patch -P 9 -p1 -%patch -P 100 -p1 %if 0%{?suse_version} < 1500 %patch -P 10 -p1 %patch -P 11 -p1