The package rpms/luminance-hdr.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/luminance-hdr.git/commit/?id=08d7929....
Change: +%ifarch %{qt5_qtwebengine_arches}
Thanks.
Full change: ============
commit dfa082b72d9bf9fb4e4770c97d26f695f3ba8ab4 Author: Benjamin A. Beasley code@musicinmybrain.net Date: Sat Nov 13 14:43:17 2021 -0500
De-conditionalize tests
diff --git a/luminance-hdr.spec b/luminance-hdr.spec index fa2eaf6..c87f260 100644 --- a/luminance-hdr.spec +++ b/luminance-hdr.spec @@ -1,5 +1,3 @@ -%bcond_without tests - Name: luminance-hdr Version: 2.6.1.1 Release: %autorelease @@ -150,9 +148,7 @@ BuildRequires: eigen3-devel
BuildRequires: librtprocess-devel
-%if %{with tests} BuildRequires: gtest-devel -%endif
Obsoletes: qtpfsgui < 2.2.0 Provides: qtpfsgui = %{version}-%{release} @@ -260,10 +256,7 @@ rm -rf src/HelpBrowser
%build -%cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DENABLE_UNIT_TEST:BOOL=%{?with_tests:ON}%{?!with_tests:OFF} \ - -GNinja +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_UNIT_TEST:BOOL=ON -GNinja %cmake_build
@@ -301,7 +294,6 @@ rm -rvf '%{buildroot}%{_datadir}/luminance-hdr/hdrhtml' ln -s ../pfstools '%{buildroot}%{_datadir}/luminance-hdr/hdrhtml'
-%if %{with tests} %check # https://github.com/LuminanceHDR/LuminanceHDR/issues/154 x='Mantiuk06Pyramid' @@ -312,7 +304,6 @@ x='Mantiuk06Pyramid' x="${x}|PoissonSolver" %endif %ctest --exclude-regex "^Test(${x})$" -%endif
%pretrans data -p <lua>
commit 7c813ceb2d8b5e09f15e86712cca060b8819610c Author: Benjamin A. Beasley code@musicinmybrain.net Date: Sat Nov 13 14:38:52 2021 -0500
Correct and simplify License fields
diff --git a/luminance-hdr.spec b/luminance-hdr.spec index 9c7e454..fa2eaf6 100644 --- a/luminance-hdr.spec +++ b/luminance-hdr.spec @@ -52,7 +52,16 @@ Summary: GUI that provides a complete workflow for HDR imaging # src/helpersse2.h # src/sleef.c # src/sleefsseavx.c -License: GPLv2+ and GPLv2 and GPLv3+ and LGPLv2+ and BSD and MIT and Boost +# +# CC0: +# net.sourceforge.qtpfsgui.LuminanceHDR.appdata.xml +# +# The resulting effective license for the compiled executables is GPLv3+. All +# other files in the binary RPMs are GPLv2+, except +# net.sourceforge.qtpfsgui.LuminanceHDR.appdata.xml which is CC0—but there is +# significant precedent in Fedora for leaving CC0 out of the license field when +# it only applies to an AppData file. +License: GPLv2+ and GPLv3+ # Additionally, the following are only build system files and do not contribute # to the License field: # @@ -204,6 +213,7 @@ Without their contribution all of this would have not been possible.
%package data Summary: Architecture-independent data files for luminance-hdr +License: GPLv2+
BuildArch: noarch
commit 67461223fd0d8bee9de5f8dec085a8d3c1c208ea Author: Benjamin A. Beasley code@musicinmybrain.net Date: Sat Nov 13 14:22:06 2021 -0500
Wrap a couple of long lines in the spec file
diff --git a/luminance-hdr.spec b/luminance-hdr.spec index 6054ed0..9c7e454 100644 --- a/luminance-hdr.spec +++ b/luminance-hdr.spec @@ -92,7 +92,8 @@ BuildRequires: libappstream-glib # To compile Luminance HDR your system will need a set of tools and code # libraries called "dependencies". The following is a list of dependencies # needed to compile the latest version of Luminance HDR: -# - [Qt5](https://www.qt.io/), the widget toolkit used by the graphical user interface (GUI). +# - [Qt5](https://www.qt.io/), the widget toolkit used by the graphical user +# interface (GUI). BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtdeclarative-devel %ifarch %{qt5_qtwebengine_arches} @@ -150,7 +151,8 @@ Provides: qtpfsgui = %{version}-%{release} # https://github.com/LuminanceHDR/LuminanceHDR/issues/241 # Original version is unclear Provides: bundled(pfstools) -# Version based on searching commit messages for “pfstmo”; could be out of date. +# Version based on searching commit messages for “pfstmo”; could be out of +# date. Provides: bundled(pfstmo) = 2.0.5
# A few routines from sleef are included; cannot build with upstream/system
commit bcd0a2115dc2dffca2f13d36a59588b0e280585e Author: Benjamin A. Beasley code@musicinmybrain.net Date: Sat Nov 13 14:21:12 2021 -0500
Reduce macro indirection in the spec file
diff --git a/luminance-hdr.spec b/luminance-hdr.spec index 13f243e..6054ed0 100644 --- a/luminance-hdr.spec +++ b/luminance-hdr.spec @@ -60,16 +60,16 @@ License: GPLv2+ and GPLv2 and GPLv3+ and LGPLv2+ and BSD and MIT and Boos # build_files/Modules/GetGitRevisionDescription.cmake{,.in} URL: http://qtpfsgui.sourceforge.net/ %global forgeurl https://github.com/LuminanceHDR/LuminanceHDR/ -Source0: %{forgeurl}/archive/v.%{version}/%{name}-%{version}.tar.gz +Source0: %{forgeurl}/archive/v.%{version}/luminance-hdr-%{version}.tar.gz # https://github.com/LuminanceHDR/LuminanceHDR/issues/242 -Source1: %{name}.1 -Source2: %{name}-cli.1 +Source1: luminance-hdr.1 +Source2: luminance-hdr-cli.1
# https://github.com/LuminanceHDR/LuminanceHDR/issues/239 -Patch0: %{name}-2.6.1.1-sleef-boost-license.patch -Patch1: %{name}-2.6.1.1-external-librtprocess.patch +Patch0: luminance-hdr-2.6.1.1-sleef-boost-license.patch +Patch1: luminance-hdr-2.6.1.1-external-librtprocess.patch # https://github.com/LuminanceHDR/LuminanceHDR/issues/247 -Patch2: %{name}-2.6.1.1-no-help-browser.patch +Patch2: luminance-hdr-2.6.1.1-no-help-browser.patch
%if 0%{?fedora} > 34 # Upstream does not support OpenEXR 3.x, and a nontrivial patch may be @@ -158,7 +158,7 @@ Provides: bundled(pfstmo) = 2.0.5 # sleef was used as the basis for the fork. Provides: bundled(sleef)
-Requires: %{name}-data = %{version}-%{release} +Requires: luminance-hdr-data = %{version}-%{release}
%global app_id net.sourceforge.qtpfsgui.LuminanceHDR
@@ -201,7 +201,7 @@ Without their contribution all of this would have not been possible.
%package data -Summary: Architecture-independent data files for %{name} +Summary: Architecture-independent data files for luminance-hdr
BuildArch: noarch
@@ -211,7 +211,7 @@ Requires: hicolor-icon-theme Requires: pfstools
%description data -Architecture-independent data files for %{name}, such as HTML help and +Architecture-independent data files for luminance-hdr, such as HTML help and translations.
@@ -261,11 +261,11 @@ rm -rf src/HelpBrowser # Upstream installs AUTHORS, Changelog, LICENSE, and README.md. We install # documentation and license files with the %%doc and %%license macros instead, # putting them in the usual locations favored by Fedora. -rm -rvf '%{buildroot}%{_datadir}/%{name}/doc' +rm -rvf '%{buildroot}%{_datadir}/luminance-hdr/doc'
# Install mimeinfo file -install -d '%{buildroot}/%{_datadir}/mime/packages' -install -t '%{buildroot}/%{_datadir}/mime/packages' -p -m 0644 %{name}.xml +install -t '%{buildroot}/%{_datadir}/mime/packages' -D -p -m 0644 \ + luminance-hdr.xml
desktop-file-install --dir=%{buildroot}/%{_datadir}/applications \ %{app_id}.desktop @@ -285,8 +285,8 @@ install -t '%{buildroot}%{_mandir}/man1' -D -p -m 0644 \
%find_lang lang --with-qt
-rm -rvf '%{buildroot}%{_datadir}/%{name}/hdrhtml' -ln -s ../pfstools '%{buildroot}%{_datadir}/%{name}/hdrhtml' +rm -rvf '%{buildroot}%{_datadir}/luminance-hdr/hdrhtml' +ln -s ../pfstools '%{buildroot}%{_datadir}/luminance-hdr/hdrhtml'
%if %{with tests} @@ -307,7 +307,7 @@ x="${x}|PoissonSolver" --[[Back up any bundled hdrhtml directory from the old package. See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Directory_Replacem... ]] -path = "%{_datadir}/%{name}/hdrhtml" +path = "%{_datadir}/luminance-hdr/hdrhtml" st = posix.stat(path) if st and st.type == "directory" then status = os.rename(path, path .. ".rpmmoved") @@ -330,8 +330,8 @@ end %doc README.md %doc TODO
-%{_bindir}/%{name} -%{_bindir}/%{name}-cli +%{_bindir}/luminance-hdr +%{_bindir}/luminance-hdr-cli
# While the following are technically arch-independent data files, they have # configuration-like functionality and should not be installed without the @@ -339,7 +339,7 @@ end
# Shared directory ownership with shared-mime-info %dir %{_datadir}/mime/packages -%{_datadir}/mime/packages/%{name}.xml +%{_datadir}/mime/packages/luminance-hdr.xml
%{_metainfodir}/%{app_id}.metainfo.xml %{_datadir}/applications/%{app_id}.desktop @@ -348,22 +348,22 @@ end %files data -f lang.lang %license LICENSE LICENSE.txt
-%dir %{_datadir}/%{name} +%dir %{_datadir}/luminance-hdr
# Relative symbolic link to %%{_datadir}/pfstools -%{_datadir}/%{name}/hdrhtml +%{_datadir}/luminance-hdr/hdrhtml # A backed-up bundled hdrhtml directory from a previous upgrade may be present: -%ghost %{_datadir}/%{name}/hdrhtml.rpmmoved +%ghost %{_datadir}/luminance-hdr/hdrhtml.rpmmoved
-%{_datadir}/%{name}/help +%{_datadir}/luminance-hdr/help
# Contents of this directory are listed by %%find_lang -%dir %{_datadir}/%{name}/i18n +%dir %{_datadir}/luminance-hdr/i18n
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/icons/hicolor/48x48/apps/luminance-hdr.png
-%{_mandir}/man1/%{name}.1* -%{_mandir}/man1/%{name}-cli.1* +%{_mandir}/man1/luminance-hdr.1* +%{_mandir}/man1/luminance-hdr-cli.1*
%changelog
commit 08d7929b024a73a42eefb263b017093061dd42bd Author: Benjamin A. Beasley code@musicinmybrain.net Date: Tue Oct 26 08:24:07 2021 -0400
Assume %%qt5_qtwebengine_arches is defined
Remove an unnecessary fallback definition.
diff --git a/luminance-hdr.spec b/luminance-hdr.spec index 7b88314..13f243e 100644 --- a/luminance-hdr.spec +++ b/luminance-hdr.spec @@ -95,7 +95,7 @@ BuildRequires: libappstream-glib # - [Qt5](https://www.qt.io/), the widget toolkit used by the graphical user interface (GUI). BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtdeclarative-devel -%ifarch %{?qt5_qtwebengine_arches}%{?!qt5_qtwebengine_arches:%{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el} +%ifarch %{qt5_qtwebengine_arches} BuildRequires: qt5-qtwebengine-devel %else BuildRequires: qt5-qtwebkit-devel
arch-excludes@lists.fedoraproject.org