rpms/libreoffice
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert OL modifications

Browse Source
This commit is contained in:
AlmaLinux RelEng Bot 2026-07-01 10:03:43 -04:00
parent dae7c48002
commit 54fcc4dfe2
5 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
SOURCES/0001-CVE-2024-3044-add-notify-for-script-use.patch Executable file → Normal file
View File

0
SOURCES/0001-disable-script-dump.patch Executable file → Normal file
View File

0
SOURCES/0003-assume-IFrame-script-macro-support-isn-t-needed.patch Executable file → Normal file
View File

0
SOURCES/libreoffice-multiliblauncher.sh Executable file → Normal file
View File

35
SPECS/libreoffice.spec
View File

@ -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 ' <draw:color draw:name="Oracle Bark" draw:color="#312d2a"/>
<draw:color draw:name="Oracle Red" draw:color="#c74634"/>
<draw:color draw:name="Oracle secondary: Sunrise" draw:color="#facd62"/>
<draw:color draw:name="Oracle secondary: Ember" draw:color="#ae562c"/>
<draw:color draw:name="Oracle secondary: Fog" draw:color="#94afaf"/>
<draw:color draw:name="Oracle secondary: Ivy" draw:color="#759c6c"/>
<draw:color draw:name="Oracle secondary: Sand" draw:color="#e5dbbe"/>
<draw:color draw:name="Oracle secondary: Ocean" draw:color="#2c5967"/>
<draw:color draw:name="Oracle secondary: Surf" draw:color="#41817e"/>
<draw:color draw:name="Oracle secondary: Forest" draw:color="#2b6242"/>
<draw:color draw:name="Oracle neutral: Air" draw:color="#fcfbfa"/>
<draw:color draw:name="Oracle neutral: Pebble" draw:color="#8b8580"/>
<draw:color draw:name="Oracle neutral: Granite" draw:color="#67605b"/>'
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 ' <draw:color draw:name="Red Hat 1" draw:color="#cc0000"/>
<draw:color draw:name="Red Hat 2" draw:color="#0093d9"/>
<draw:color draw:name="Red Hat 3" draw:color="#ff8d00"/>
<draw:color draw:name="Red Hat 4" draw:color="#abb400"/>
<draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>' && \
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 <darren.archibald@oracle.com> - 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 <tpopela@redhat.com> - 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