AlmaLinux changes

This commit is contained in:
eabdullin 2022-04-01 13:12:08 +03:00
parent 04e24e7c53
commit 68f8075e53
1 changed files with 5 additions and 12 deletions

View File

@ -1,6 +1,7 @@
# This package depends on automagic byte compilation
# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2
%global _python_bytecompile_extra 1
%global dist %{?dist}.alma
# download path contains version without the last (fourth) digit
%global libo_version 6.4.7
@ -12,7 +13,7 @@
%global libo_buildfix %{nil}
# rhbz#715152 state vendor
%if 0%{?rhel}
%global vendoroption --with-vendor="Red Hat, Inc."
%global vendoroption --with-vendor="AlmaLinux"
%endif
%if 0%{?fedora}
%global vendoroption --with-vendor="The Fedora Project"
@ -997,17 +998,6 @@ git config gc.auto 0 # disable auto packing
git add -A
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
git am %{patches}
@ -2275,6 +2265,9 @@ done
%{_includedir}/LibreOfficeKit
%changelog
* Fri Apr 01 2022 Eduard Abdullin <eabdullin@almalinux.org> - 1:6.4.7.2-10.alma
- AlmaLinux changes
* Mon Feb 07 2022 Caolán McNamara <caolanm@redhat.com> - 1:6.4.7.2-10
- Related: rhbz#2029810 bump n-v-r