|
|
@ -999,11 +999,6 @@ gpgv2 --keyring ./keyring.gpg %{SOURCE5} %{SOURCE4}
|
|
|
|
%setup -q -n %{name}-%{version}%{?libo_prerelease} -b 2 -b 4
|
|
|
|
%setup -q -n %{name}-%{version}%{?libo_prerelease} -b 2 -b 4
|
|
|
|
rm -rf git-hooks */git-hooks
|
|
|
|
rm -rf git-hooks */git-hooks
|
|
|
|
|
|
|
|
|
|
|
|
# This is normally done by %%autosetup -S git_am,
|
|
|
|
|
|
|
|
# but that does not work with multiple -b options, so we use plain %%setup above
|
|
|
|
|
|
|
|
%global __scm git_am
|
|
|
|
|
|
|
|
%__scm_setup_git_am -q
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#Customize Palette to add Red Hat colours
|
|
|
|
#Customize Palette to add Red Hat colours
|
|
|
|
(head -n -1 extras/source/palettes/standard.soc && \
|
|
|
|
(head -n -1 extras/source/palettes/standard.soc && \
|
|
|
|
echo -e ' <draw:color draw:name="Red Hat 1" draw:color="#cc0000"/>
|
|
|
|
echo -e ' <draw:color draw:name="Red Hat 1" draw:color="#cc0000"/>
|
|
|
@ -1013,7 +1008,6 @@ rm -rf git-hooks */git-hooks
|
|
|
|
<draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>' && \
|
|
|
|
<draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>' && \
|
|
|
|
tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
|
|
|
|
tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
|
|
|
|
mv -f redhat.soc extras/source/palettes/standard.soc
|
|
|
|
mv -f redhat.soc extras/source/palettes/standard.soc
|
|
|
|
git commit -q -m 'add Red Hat colors to palette' extras/source/palettes/standard.soc
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# apply patches
|
|
|
|
# apply patches
|
|
|
|
%autopatch -p1 -M 99
|
|
|
|
%autopatch -p1 -M 99
|
|
|
@ -1481,9 +1475,6 @@ export DESTDIR=%{buildroot}
|
|
|
|
# org.libreoffice.LibreOffice.appdata.xml:
|
|
|
|
# org.libreoffice.LibreOffice.appdata.xml:
|
|
|
|
solenv/bin/assemble-flatpak-appdata.sh \
|
|
|
|
solenv/bin/assemble-flatpak-appdata.sh \
|
|
|
|
%{buildroot}%{_datadir}/metainfo/ 0
|
|
|
|
%{buildroot}%{_datadir}/metainfo/ 0
|
|
|
|
# ...then append the original files to the single file:
|
|
|
|
|
|
|
|
solenv/bin/assemble-flatpak-appdata-step2.sh \
|
|
|
|
|
|
|
|
%{buildroot}%{_datadir}/metainfo/ %{buildroot}%{_datadir}/metainfo/
|
|
|
|
|
|
|
|
rm %{buildroot}%{_datadir}/metainfo/libreoffice-*.appdata.xml
|
|
|
|
rm %{buildroot}%{_datadir}/metainfo/libreoffice-*.appdata.xml
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
@ -2266,6 +2257,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
|
|
|
|
- Disable unreliable test under s390x
|
|
|
|
- Disable unreliable test under s390x
|
|
|
|
- Try verbose make if first build attempt fails
|
|
|
|
- Try verbose make if first build attempt fails
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Sun Aug 13 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.0.3-1
|
|
|
|
|
|
|
|
- 7.6.0.3
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Aug 02 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:7.5.5.2-2
|
|
|
|
* Wed Aug 02 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:7.5.5.2-2
|
|
|
|
- Poppler rebuild.
|
|
|
|
- Poppler rebuild.
|
|
|
|
|
|
|
|
|
|
|
|