AlmaLinux changes
This commit is contained in:
parent
db4f2d935d
commit
41ecbcbca3
@ -8,7 +8,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="Red Hat, Inc."
|
%global vendoroption --with-vendor="AlmaLinux OS Foundation"
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
%global vendoroption --with-vendor="The Fedora Project"
|
%global vendoroption --with-vendor="The Fedora Project"
|
||||||
@ -27,6 +27,7 @@
|
|||||||
# URL for external projects' tarballs
|
# URL for external projects' tarballs
|
||||||
%global external_url http://dev-www.libreoffice.org/src
|
%global external_url http://dev-www.libreoffice.org/src
|
||||||
%global girapiversion 0.1
|
%global girapiversion 0.1
|
||||||
|
%global dist %{?dist}.alma
|
||||||
|
|
||||||
# get english only and no-langpacks for a faster smoketest build
|
# get english only and no-langpacks for a faster smoketest build
|
||||||
# fedpkg compile/install/local/mockbuild does not handle --without ATM,
|
# fedpkg compile/install/local/mockbuild does not handle --without ATM,
|
||||||
@ -1012,17 +1013,6 @@ rm -rf git-hooks */git-hooks
|
|||||||
%global __scm git_am
|
%global __scm git_am
|
||||||
%__scm_setup_git_am
|
%__scm_setup_git_am
|
||||||
|
|
||||||
#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
|
||||||
%autopatch -M 99
|
%autopatch -M 99
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
@ -2269,6 +2259,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
|
|||||||
%{_includedir}/LibreOfficeKit
|
%{_includedir}/LibreOfficeKit
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 18 2022 Eduard Abdullin <eabdullin@almalinux.org> - 1:7.1.8.1-6.alma
|
||||||
|
- Debrand for AlmaLinux
|
||||||
|
|
||||||
* Tue Feb 22 2022 Caolán McNamara <caolanm@redhat.com> - 1:7.1.8.1-6
|
* Tue Feb 22 2022 Caolán McNamara <caolanm@redhat.com> - 1:7.1.8.1-6
|
||||||
- Resolves: rhbz#2056412 merge in fedoa 34 changes
|
- Resolves: rhbz#2056412 merge in fedoa 34 changes
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user