From ed3d2ea7d998fba83ad8d40c239566898a5553a4 Mon Sep 17 00:00:00 2001 From: AlmaLinux RelEng Bot Date: Mon, 6 Jul 2026 09:01:12 -0400 Subject: [PATCH] Revert OL modifications --- ...-2024-3044-add-notify-for-script-use.patch | 0 SOURCES/0001-disable-script-dump.patch | 0 ...me-script-macro-support-isn-t-needed.patch | 0 SOURCES/libreoffice-multiliblauncher.sh | 0 SPECS/libreoffice.spec | 35 ++++++------------- 5 files changed, 11 insertions(+), 24 deletions(-) mode change 100755 => 100644 SOURCES/0001-CVE-2024-3044-add-notify-for-script-use.patch mode change 100755 => 100644 SOURCES/0001-disable-script-dump.patch mode change 100755 => 100644 SOURCES/0003-assume-IFrame-script-macro-support-isn-t-needed.patch mode change 100755 => 100644 SOURCES/libreoffice-multiliblauncher.sh diff --git a/SOURCES/0001-CVE-2024-3044-add-notify-for-script-use.patch b/SOURCES/0001-CVE-2024-3044-add-notify-for-script-use.patch old mode 100755 new mode 100644 diff --git a/SOURCES/0001-disable-script-dump.patch b/SOURCES/0001-disable-script-dump.patch old mode 100755 new mode 100644 diff --git a/SOURCES/0003-assume-IFrame-script-macro-support-isn-t-needed.patch b/SOURCES/0003-assume-IFrame-script-macro-support-isn-t-needed.patch old mode 100755 new mode 100644 diff --git a/SOURCES/libreoffice-multiliblauncher.sh b/SOURCES/libreoffice-multiliblauncher.sh old mode 100755 new mode 100644 diff --git a/SPECS/libreoffice.spec b/SPECS/libreoffice.spec index d14a19e..d325090 100644 --- a/SPECS/libreoffice.spec +++ b/SPECS/libreoffice.spec @@ -13,7 +13,7 @@ ExcludeArch: %{ix86} %global libo_buildfix %{nil} # rhbz#715152 state vendor %if 0%{?rhel} -%global vendoroption --with-vendor="Oracle America, Inc." +%global vendoroption --with-vendor="Red Hat, Inc." %endif %if 0%{?fedora} %global vendoroption --with-vendor="The Fedora Project" @@ -62,7 +62,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 15%{?libo_prerelease}.0.1%{?dist}.1 +Release: 15%{?libo_prerelease}%{?dist}.1 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -1045,24 +1045,16 @@ rm -rf git-hooks */git-hooks %global __scm git_am %__scm_setup_git_am -#Customize Palette to add Oracle colours +#Customize Palette to add Red Hat colours (head -n -1 extras/source/palettes/standard.soc && \ -echo -e ' - - - - - - - - - - - -' -tail -n 1 extras/source/palettes/standard.soc) > oracle.soc -mv -f oracle.soc extras/source/palettes/standard.soc -git commit -q -a -m 'add Oracle colors to palette' + echo -e ' + + + + ' && \ + tail -n 1 extras/source/palettes/standard.soc) > redhat.soc +mv -f redhat.soc extras/source/palettes/standard.soc +git commit -q -a -m 'add Red Hat colors to palette' # apply patches %autopatch -M 99 @@ -1178,7 +1170,6 @@ touch autogen.lastrun --without-export-validation \ --without-fonts \ --without-lxml \ - --with-hamcrest=yes \ --with-gdrive-client-secret="GYWrDtzyZQZ0_g5YoBCC6F0I" \ --with-gdrive-client-id="457862564325.apps.googleusercontent.com" \ --enable-python=system \ @@ -2318,10 +2309,6 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog -* Mon Jun 29 2026 Darren Archibald - 1:7.1.8.1-15.0.1.el9_8.1 -- Added the --with-hamcrest option to configure. -- Replace colors with Oracle colors [Orabug: 32120093] - * Tue May 19 2026 Tomas Popela - 1:7.1.8.1-15.el9_8.1 - Fix CVE-2026-4430 Conform AlignEngine parsing to what section 2.3.4.10 of the spec has