Re-enable AAD support in RHEL

The AAD support was dropped for RHEL because of the missing cJSON
dependency. The JSON-C dependency can be used instead since the 3.6.2
release. Let's switch to it and enable the AAD support again.

Resolves: RHEL-31752
This commit is contained in:
Ondrej Holy 2024-07-04 13:47:35 +02:00
parent 62de033e86
commit a22b1d1e5c

View File

@ -20,7 +20,6 @@
%global _with_static_uwac 1
# Disable unwanted dependencies for RHEL
%{!?rhel:%global _with_aad 1}
%{!?rhel:%global _with_sdl_client 1}
%{!?rhel:%global _with_soxr 1}
%{!?rhel:%global _with_uriparser 1}
@ -78,7 +77,7 @@ BuildRequires: xmlto
BuildRequires: zlib-devel
BuildRequires: multilib-rpm-config
%{?_with_aad:BuildRequires: cmake(cJSON)}
BuildRequires: cmake(json-c)
# Packaging error led to cmake files in the wrong place
# Fixed in https://src.fedoraproject.org/rpms/uriparser/c/1b07302bfc80983fbf84283783370e8338d36429
%{?_with_uriparser:BuildRequires: (cmake(uriparser) and uriparser-devel)}
@ -183,7 +182,7 @@ find . -name "*.c" -exec chmod 664 {} \;
%cmake %{?_cmake_skip_rpath} \
-DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \
-DWITH_ALSA=ON \
-DWITH_AAD=%{?_with_aad:ON}%{?!_with_aad:OFF} \ \
-DWITH_AAD=ON \
-DWITH_CAIRO=ON \
-DWITH_CUPS=ON \
-DWITH_CHANNELS=ON -DBUILTIN_CHANNELS=OFF \
@ -197,6 +196,7 @@ find . -name "*.c" -exec chmod 664 {} \;
-DWITH_ICU=ON \
-DWITH_IPP=OFF \
-DWITH_JPEG=ON \
-DWITH_JSONC_REQUIRED=ON \
-DWITH_KRB5=ON \
-DWITH_LAME=ON \
-DWITH_MANPAGES=ON \