libproxy lives! Remove the !libproxy conditionals

Related: RHEL-30210
This commit is contained in:
Michael Catanzaro 2024-04-18 10:00:27 -05:00
parent 14c6b555b8
commit 859c651868

View File

@ -2,9 +2,6 @@
%global tarball_version %%(echo %{version} | tr '~' '.')
# Not yet sure whether to have libproxy in el10, but assume yes for now.
%global with_libproxy 1
Name: glib-networking
Version: 2.80~alpha
Release: %autorelease
@ -22,9 +19,7 @@ BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(gsettings-desktop-schemas)
%if 0%{?with_libproxy}
BuildRequires: pkgconfig(libproxy-1.0)
%endif
BuildRequires: pkgconfig(p11-kit-1)
BuildRequires: systemd-rpm-macros
@ -57,13 +52,7 @@ the functionality of the installed glib-networking package.
%autosetup -p1 -n %{name}-%{tarball_version}
%build
%meson \
%if !0%{?with_libproxy}
-Dlibproxy=disabled \
-Denvironment_proxy=enabled \
%endif
-Dinstalled_tests=true \
%nil
%meson -Dinstalled_tests=true
%meson_build
%install
@ -79,14 +68,10 @@ the functionality of the installed glib-networking package.
%doc NEWS README
%{_libdir}/gio/modules/libgiognomeproxy.so
%{_libdir}/gio/modules/libgiognutls.so
%if 0%{?with_libproxy}
%{_libdir}/gio/modules/libgiolibproxy.so
%{_libexecdir}/glib-pacrunner
%{_datadir}/dbus-1/services/org.gtk.GLib.PACRunner.service
%{_userunitdir}/glib-pacrunner.service
%else
%{_libdir}/gio/modules/libgioenvironmentproxy.so
%endif
%files tests
%{_libexecdir}/installed-tests/glib-networking