efl.spec

@@ -1,8 +1,6 @@
 %global _hardened_build 1
 %global has_luajit 1
 
-%bcond_with avif
-
 %if 0%{?rhel} && 0%{?rhel} <= 7
 %global has_luajit 0
 %endif
@@ -25,14 +23,10 @@
 %global use_wayland 0
 %endif
 
-# Disable libavif support for now
-# https://phab.enlightenment.org/T8844
-# efl 1.25.1 or git master fails to compile with libavif v0.8.2
-%bcond_with avif
 
 Name:		efl
 Version:	1.25.1
-Release:	4%{?dist}
+Release:	3%{?dist}
 Summary:	Collection of Enlightenment libraries
 License:	BSD and LGPLv2+ and GPLv2 and zlib
 URL:		http://enlightenment.org/
@@ -66,11 +60,12 @@ BuildRequires:	libxkbcommon-devel uuid-devel libxkbcommon-x11-devel avahi-devel
 BuildRequires:	rlottie-devel
 BuildRequires:	pkgconfig(poppler-cpp) >= 0.12
 BuildRequires:	pkgconfig(libspectre) pkgconfig(libraw)
-BuildRequires:	pkgconfig(librsvg-2.0) >= 2.14.0
+BuildRequires:	pkgconfig(librsvg-2.0) >= 2.14.0 
 BuildRequires:	pkgconfig(cairo) >= 1.0.0
-%if %{with avif}
-BuildRequires:	pkgconfig(libavif)
-%endif
+# Disable libavif support for now
+# https://phab.enlightenment.org/T8844
+# efl 1.25.1 or git master fails to compile with libavif v0.8.2
+#BuildRequires:	pkgconfig(libavif)
 %if %{with_scim}
 BuildRequires:	scim-devel
 %endif
@@ -215,14 +210,11 @@ Development files for EFL.
 #  data/libeo.so.%{version}-gdb.py
 
 %build
+# Disable libavif support for now
 %{meson} \
  -Dxinput22=true \
  -Dsystemd=true \
-%if %{with avif}
- -Devas-loaders-disabler=json \
-%else
  -Devas-loaders-disabler=json,avif \
-%endif
  -Dharfbuzz=true \
  -Dsdl=true \
  -Dbuffer=true \
@@ -578,12 +570,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libexactness*.so
 
 %changelog
-* Fri Dec  4 2020 Tom Callaway <spot@fedoraproject.org> - 1.25.1-4
-- merge libavif logic to one spec
-
-* Mon Nov 30 2020 Andreas Schneider <asn@redhat.com> - 1.25.1-3.1
-- Disable avif support
-
 * Tue Oct 27 2020 Mamoru TASAKA <mtasaka@fedoraprojet.org> - 1.25.1-3
 - Disable libavif support for now (bug 1891658)