PR#8: Don't define patches conditionally - rpms/libreoffice

rpms / libreoffice

#8 Don't define patches conditionally

Merged 3 years ago by caolanm. Opened 3 years ago by churchyard.

rpms/ churchyard/libreoffice autopatch into master

Don't define patches conditionally

Miro Hrončok • 3 years ago

ee1acf3

libreoffice.spec

file modified

+14 -13

		`@@ -247,9 +247,6 @@`
		`# backported`
		`Patch3: 0001-fix-detecting-qrcodegen.patch`
		`Patch4: 0001-rhbz-1870501-crash-on-reexport-of-odg.patch`
		`- %if 0%{?fedora} > 33 \|\| 0%{?rhel} > 8`
		`- Patch5: 0001-Upgrade-liborcus-to-0.16.0.patch`
		`- %endif`
		`Patch6: 0001-rhbz-1882616-move-cursor-one-step-at-a-time-in-the-d.patch`
		`Patch7: 0001-export-HYPERLINK-target-in-html-clipboard-export.patch`
		`Patch8: 0001-rhbz-1891326-suggest-package-install-of-the-most-app.patch`
		`@@ -257,10 +254,10 @@`
		`Patch10: 0001-gcc11.patch`
		`Patch11: 0001-Resolves-rhbz-1900428-don-t-crash-on-invalid-index-u.patch`

		`- %if 0%{?rhel}`
		`+ # Patches with numbers above 100 are applied conditionally`
		`+ Patch101: 0001-Upgrade-liborcus-to-0.16.0.patch`
		`# not upstreamed`
		`Patch500: 0001-disable-libe-book-support.patch`
		`- %endif`

		`%global instdir %{_libdir}`
		`%global baseinstdir %{instdir}/libreoffice`
		`@@ -985,13 +982,10 @@`
		`%setup -q -n %{name}-%{version}%{?libo_prerelease} -b 2 -b 4`
		`rm -rf git-hooks */git-hooks`

		`- # set up git repo`
		`- git init`
		`- git config user.name rpmbuild`
		`- git config user.email rpmbuild@fedoraproject.org`
		`- git config gc.auto 0 # disable auto packing`
		`- git add -A`
		`- git commit -q -a -m %{name}-%{version}`
		`+ # 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`

		`#Customize Palette to add Red Hat colours`
		`(head -n -1 extras/source/palettes/standard.soc && \`
		`@@ -1005,7 +999,14 @@`
		`git commit -q -a -m 'add Red Hat colors to palette'`

		`# apply patches`
		`- git am %{patches}`
		`+ %autopatch -M 99`
		`+ %if 0%{?fedora} > 33 \|\| 0%{?rhel} > 8`
		`+ %apply_patch -q %{PATCH101}`
		`+ %endif`
		`+ %if 0%{?rhel}`
		`+ %apply_patch -q %{PATCH500}`
		`+ %endif`
		`+`

		`sed -i -e /CppunitTest_sw_ooxmlexport7/d sw/Module_sw.mk # i686`
		`sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk # ppc64le`

churchyard commented 3 years ago

Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1898093

zuul commented 3 years ago

Build failed.

rpm-scratch-build : FAILURE in 11m 00s
rpm-linter : SKIPPED
rpm-rpminspect : SKIPPED (non-voting)
check-for-tests : SKIPPED
rpm-install-test : SKIPPED
rpm-test : SKIPPED

churchyard commented 3 years ago

Not sure how was the failure introduced. Let me compare the prepped dirs (except for .git-rpm content).

churchyard commented 3 years ago

$ diff -ur libreoffice-7.0.3.1_master libreoffice-7.0.3.1_autopatch
Only in libreoffice-7.0.3.1_master: ChangeLog-helpcontent2
Only in libreoffice-7.0.3.1_master: helpcontent2

This is weird. No idea why the files went missing.

caolanm commented on line 43 of libreoffice.spec 3 years ago

We are not getting libreoffice-help-7.0.3.1.tar.xz unpacked here it looks like the second -b 4 overwrites the first -b 2 (maybe these should be -a, instead of -b ? but the same limitation exists). Bug https://bugs.centos.org/view.php?id=17300 suggests autosetup isn't working with more than one additional source.

Edited 3 years ago by caolanm

churchyard commented 3 years ago

Oh, damn it. Thanks for spotting the difference. I'll see what can be done instead.

rebased onto ee1acf3

3 years ago

churchyard commented 3 years ago

Fixed the problem.

zuul commented 3 years ago

Build failed.

rpm-scratch-build : FAILURE in 8m 29s
rpm-linter : SKIPPED
rpm-rpminspect : SKIPPED (non-voting)
check-for-tests : SKIPPED
rpm-install-test : SKIPPED
rpm-test : SKIPPED

churchyard commented 3 years ago

Unrelated:

DEBUG util.py:634:  Error: 
DEBUG util.py:634:   Problem 1: package kf5-kdelibs4support-devel-5.76.0-1.fc34.x86_64 requires libKF5KDELibs4Support.so.5()(64bit), but none of the providers can be installed
DEBUG util.py:634:    - package kf5-kdelibs4support-devel-5.76.0-1.fc34.x86_64 requires kf5-kdelibs4support-libs(x86-64) = 5.76.0-1.fc34, but none of the providers can be installed
DEBUG util.py:634:    - package kf5-kdelibs4support-libs-5.76.0-1.fc34.x86_64 requires libKF5XmlGui.so.5()(64bit), but none of the providers can be installed
DEBUG util.py:634:    - conflicting requests
DEBUG util.py:634:    - nothing provides libQt5Core.so.5(Qt_5.15.2_PRIVATE_API)(64bit) needed by kf5-kxmlgui-5.76.0-2.fc34.x86_64
DEBUG util.py:634:    - nothing provides qt5-qtbase(x86-64) = 5.15.2 needed by kf5-kxmlgui-5.76.0-2.fc34.x86_64
DEBUG util.py:634:   Problem 2: package kf5-kio-devel-5.76.0-1.fc34.x86_64 requires libKF5KIOFileWidgets.so.5()(64bit), but none of the providers can be installed
DEBUG util.py:634:    - package kf5-kio-file-widgets-5.76.0-1.fc34.x86_64 requires libKF5XmlGui.so.5()(64bit), but none of the providers can be installed
DEBUG util.py:634:    - conflicting requests
DEBUG util.py:634:    - nothing provides libQt5Core.so.5(Qt_5.15.2_PRIVATE_API)(64bit) needed by kf5-kxmlgui-5.76.0-2.fc34.x86_64
DEBUG util.py:634:    - nothing provides qt5-qtbase(x86-64) = 5.15.2 needed by kf5-kxmlgui-5.76.0-2.fc34.x86_64

churchyard commented 3 years ago

recheck