De-branded for MSVSphere

i8 changed/i8/libreoffice-6.4.7.2-13.el8.inferit
Sergey Cherevko 1 year ago
parent 878d83f1de
commit 4c2bf9542e
Signed by: scherevko
GPG Key ID: D87CBBC16D2E4A72

@ -0,0 +1,25 @@
From aa65f18361e45be1798b0d68c551d865701aac2c Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
Date: Mon, 27 Nov 2023 16:57:06 +0300
Subject: [PATCH] MSVSphere build patch
---
configure.ac | 2 ++
1 file changed, 2 insertions(+)
diff --git a/configure.ac b/configure.ac
index 2d2d81270..25b62eccc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12102,6 +12102,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no"; then
HAMCREST_JAR=/usr/share/lib/java/hamcrest.jar
elif test -e /usr/share/java/hamcrest/core.jar; then
HAMCREST_JAR=/usr/share/java/hamcrest/core.jar
+ elif test -e /usr/share/java/hamcrest/hamcrest.jar; then
+ HAMCREST_JAR=/usr/share/java/hamcrest/hamcrest.jar
else
HAMCREST_JAR=/usr/share/java/hamcrest.jar
fi
--
2.39.3

@ -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="Red Hat, Inc." %global vendoroption --with-vendor="MSVSphere"
%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: 13%{?libo_prerelease}%{?dist} Release: 13%{?libo_prerelease}%{?dist}.inferit
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/
@ -291,6 +291,8 @@ Patch44: 0001-CVE-2022-3140.patch
Patch500: 0001-disable-libe-book-support.patch Patch500: 0001-disable-libe-book-support.patch
%endif %endif
Patch1000: 0001-MSVSphere-build-patch.patch
%global instdir %{_libdir} %global instdir %{_libdir}
%global baseinstdir %{instdir}/libreoffice %global baseinstdir %{instdir}/libreoffice
%global sdkinstdir %{baseinstdir}/sdk %global sdkinstdir %{baseinstdir}/sdk
@ -1003,17 +1005,6 @@ 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}
@ -2287,7 +2278,10 @@ done
%{_includedir}/LibreOfficeKit %{_includedir}/LibreOfficeKit
%changelog %changelog
* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1:6.4.7.2-13 * Mon Nov 27 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1:6.4.7.2-13.inferit
- Added one more location to look for Hamcrest jar
- Changed vendor to MSVSphere
- Removed upstream colors from palette
- Rebuilt for MSVSphere 8.8 - Rebuilt for MSVSphere 8.8
* Mon Nov 21 2022 Stephan Bergmann <sbergman@redhat.com> - 1:6.4.7.2-13 * Mon Nov 21 2022 Stephan Bergmann <sbergman@redhat.com> - 1:6.4.7.2-13

Loading…
Cancel
Save