Merge and update

SPECS/libheif.spec

@@ -1,5 +1,7 @@
 %global somajor 1
-%global hevc 1
+
+# Unable to ship this in Fedora
+%bcond_with hevc
 
 Name:           libheif
 Version:        1.16.1
@@ -17,11 +19,11 @@ BuildRequires:  pkgconfig(aom)
 BuildRequires:  pkgconfig(dav1d)
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libpng)
-%if ! (0%{?rhel} && 0%{?rhel} <= 8)
+%if ! (0%{?rhel} && 0%{?rhel} <= 9)
 BuildRequires:  pkgconfig(libsharpyuv)
 BuildRequires:  pkgconfig(rav1e)
 %endif
-%if ! ((0%{?rhel} && 0%{?rhel} <= 8) || (0%{?fedora} && 0%{?fedora} < 38))
+%if ! ((0%{?rhel} && 0%{?rhel} <= 9) || (0%{?fedora} && 0%{?fedora} < 38))
 BuildRequires:  pkgconfig(SvtAv1Enc)
 %endif
 
@@ -34,10 +36,10 @@ file format decoder and encoder.
 %doc README.md
 %{_libdir}/*.so.%{somajor}{,.*}
 %dir %{_libdir}/%{name}
-%if ! (0%{?rhel} && 0%{?rhel} <= 8)
+%if ! (0%{?rhel} && 0%{?rhel} <= 9)
 %{_libdir}/%{name}/%{name}-rav1e.so
 %endif
-%if ! ((0%{?rhel} && 0%{?rhel} <= 8) || (0%{?fedora} && 0%{?fedora} < 38))
+%if ! ((0%{?rhel} && 0%{?rhel} <= 9) || (0%{?fedora} && 0%{?fedora} < 38))
 %{_libdir}/%{name}/%{name}-svtenc.so
 %endif