Compare commits
No commits in common. "a8" and "c8" have entirely different histories.
@ -12,7 +12,7 @@
|
|||||||
%global libo_buildfix %{nil}
|
%global libo_buildfix %{nil}
|
||||||
# rhbz#715152 state vendor
|
# rhbz#715152 state vendor
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
%global vendoroption --with-vendor="AlmaLinux"
|
%global vendoroption --with-vendor="Red Hat, Inc."
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
%global vendoroption --with-vendor="The Fedora Project"
|
%global vendoroption --with-vendor="The Fedora Project"
|
||||||
@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite
|
|||||||
Name: libreoffice
|
Name: libreoffice
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: %{libo_version}.2
|
Version: %{libo_version}.2
|
||||||
Release: 18%{?libo_prerelease}%{?dist}.alma.1
|
Release: 18%{?libo_prerelease}%{?dist}
|
||||||
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
|
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/
|
URL: http://www.libreoffice.org/
|
||||||
|
|
||||||
@ -1020,6 +1020,17 @@ git config gc.auto 0 # disable auto packing
|
|||||||
git add -A
|
git add -A
|
||||||
git commit -q -a -m %{name}-%{version}
|
git commit -q -a -m %{name}-%{version}
|
||||||
|
|
||||||
|
#Customize Palette to add Red Hat colours
|
||||||
|
(head -n -1 extras/source/palettes/standard.soc && \
|
||||||
|
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
|
# apply patches
|
||||||
git am %{patches}
|
git am %{patches}
|
||||||
|
|
||||||
@ -2297,9 +2308,6 @@ done
|
|||||||
%{_includedir}/LibreOfficeKit
|
%{_includedir}/LibreOfficeKit
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Aug 20 2024 Eduard Abdullin <eabdullin@almalinux.org> - 1:6.4.7.2-18.alma.1
|
|
||||||
- Debrand for AlmaLinux
|
|
||||||
|
|
||||||
* Thu Aug 15 2024 Eike Rathke <erack@redhat.com> - 1:6.4.7.2-18
|
* Thu Aug 15 2024 Eike Rathke <erack@redhat.com> - 1:6.4.7.2-18
|
||||||
- Fix CVE-2024-6472 remove ability to trust not validated macro signatures in
|
- Fix CVE-2024-6472 remove ability to trust not validated macro signatures in
|
||||||
high security
|
high security
|
||||||
|
Loading…
Reference in New Issue
Block a user