#1 Remove unneeded %if statements
Merged a year ago by tdawson. Opened a year ago by tdawson.
Unknown source build-on-rhel  into  rawhide

file modified
-16
@@ -5,12 +5,6 @@

  # package-notes causes FTBFS (#2043178)

  %undefine _package_note_file

  

- %if 0%{?fedora}

- # need libvpx >= 1.8.0 (need commit 297dfd869609d7c3c5cd5faa3ebc7b43a394434e)

- %global use_system_libvpx 1

- # For screen sharing on Wayland, currently Fedora only thing - no epel

- %global pipewire 1

- %endif

  %global use_system_libwebp 1

  %global use_system_jsoncpp 1

  %if 0%{?rhel} && 0%{?rhel} == 9
@@ -151,9 +145,7 @@

  BuildRequires: pkgconfig(libdrm)

  BuildRequires: pkgconfig(libevent)

  BuildRequires: pkgconfig(libpci)

- %if 0%{?pipewire}

  BuildRequires: pkgconfig(libpipewire-0.3)

- %endif

  BuildRequires: pkgconfig(libpng)

  BuildRequires: pkgconfig(libpulse)

  BuildRequires: pkgconfig(libudev)
@@ -184,9 +176,7 @@

  BuildRequires: perl-interpreter

  BuildRequires: %{__python3}

  BuildRequires: python3-html5lib

- %if 0%{?use_system_libvpx}

  BuildRequires: pkgconfig(vpx) >= 1.8.0

- %endif

  BuildRequires: pkgconfig(libavcodec)

  BuildRequires: pkgconfig(libavformat)

  BuildRequires: pkgconfig(libavutil)
@@ -246,12 +236,6 @@

  Provides: bundled(libjingle)

  # see src/3rdparty/chromium/third_party/libsrtp/CHANGES for the version number

  Provides: bundled(libsrtp) = 2.4.0

- %if !0%{?use_system_libvpx}

- Provides: bundled(libvpx) = 1.10.0

- %endif

- %if !0%{?use_system_libwebp}

- Provides: bundled(libwebp) = 1.2.2

- %endif

  # bundled as "libxml"

  # see src/3rdparty/chromium/third_party/libxml/linux/include/libxml/xmlversion.h

  Provides: bundled(libxml2) = 2.9.13

qt6-qtwebengine will only be build on RHEL 9+
RHEL 9+ has the required pipewire and libvpx libraries.
This commit remove the various %if statements around those libraries.

Signed-off-by: Troy Dawson tdawson@redhat.com

This has passed all of my Fedora and ELN test builds. Merging.

Pull-Request has been merged by tdawson

a year ago
Metadata