diff --git a/luminance-hdr.spec b/luminance-hdr.spec index 59cd3a8..9a14057 100644 --- a/luminance-hdr.spec +++ b/luminance-hdr.spec @@ -93,15 +93,6 @@ Patch: 0001-Update-help-tree-files-from-Scribus-SVN-24770.patch Patch: 0002-Fix-an-include-path-in-schelptreemodel.h.patch Patch: 0003-Comment-out-Q_OBJECT-in-ScHelpTreeModel-and-TreeMode.patch -%if 0%{?fedora} > 34 -# Upstream does not support OpenEXR 3.x, and a nontrivial patch may be -# required. See https://bugzilla.redhat.com/show_bug.cgi?id=1968167 and -# https://github.com/LuminanceHDR/LuminanceHDR/issues/244. For now, we must use -# the OpenEXR 2.x compatibility package. (In the long term, this package will -# risk retirement if upstream does not resume active development.) -%global openexr_compat 2 -%endif - BuildRequires: cmake # We choose to use the ninja backend instead of the make backend. Either works. BuildRequires: ninja-build @@ -147,7 +138,13 @@ BuildRequires: libpng-devel BuildRequires: LibRaw-devel # - [OpenEXR](http://www.openexr.com/), used to read and write high dynamic # range EXR files. Some distributions refer to the package as `ilmbase`. -BuildRequires: openexr%{?openexr_compat}-devel +# +# Upstream does not support OpenEXR 3.x, and a nontrivial patch may be +# required. See https://bugzilla.redhat.com/show_bug.cgi?id=1968167 and +# https://github.com/LuminanceHDR/LuminanceHDR/issues/244. For now, we must +# use the OpenEXR 2.x compatibility package. (In the long term, this package +# will risk retirement if upstream does not resume active development.) +BuildRequires: openexr2-devel # - [CFITSIO](https://heasarc.gsfc.nasa.gov/fitsio/), an optional library for # reading and writing FITS files, commonly used by the astrophotographer # community. @@ -325,25 +322,6 @@ x="${x}|PoissonSolver" %ctest --exclude-regex "^Test(${x})\$" -%pretrans data -p ---[[Back up any bundled hdrhtml directory from the old package. See: -https://docs.fedoraproject.org/en-US/packaging-guidelines/Directory_Replacement -]] -path = "%{_datadir}/luminance-hdr/hdrhtml" -st = posix.stat(path) -if st and st.type == "directory" then - status = os.rename(path, path .. ".rpmmoved") - if not status then - suffix = 0 - while not status do - suffix = suffix + 1 - status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix) - end - os.rename(path, path .. ".rpmmoved") - end -end - - %files %doc AUTHORS %doc BUGS