Disable libproxy in RHEL

Resolves: #1968554
This commit is contained in:
Michael Catanzaro 2021-06-07 10:22:16 -05:00
parent 3dc5a96d93
commit 3d33028bd4

View File

@ -2,9 +2,14 @@
%global tarball_version %%(echo %{version} | tr '~' '.') %global tarball_version %%(echo %{version} | tr '~' '.')
# No libproxy in RHEL
%if !0%{?rhel}
%global with_libproxy 1
%endif
Name: glib-networking Name: glib-networking
Version: 2.68.1 Version: 2.68.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: Networking support for GLib Summary: Networking support for GLib
License: LGPLv2+ License: LGPLv2+
@ -15,7 +20,9 @@ BuildRequires: meson
BuildRequires: gcc BuildRequires: gcc
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-2.0)
%if 0%{?with_libproxy}
BuildRequires: pkgconfig(libproxy-1.0) BuildRequires: pkgconfig(libproxy-1.0)
%endif
BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(gnutls)
BuildRequires: ca-certificates BuildRequires: ca-certificates
@ -45,7 +52,12 @@ the functionality of the installed glib-networking package.
%autosetup -p1 -n %{name}-%{tarball_version} %autosetup -p1 -n %{name}-%{tarball_version}
%build %build
%meson -Dinstalled_tests=true %meson \
%if !0%{?with_libproxy}
-Dlibproxy=disabled \
%endif
-Dinstalled_tests=true \
%nil
%meson_build %meson_build
%install %install
@ -56,18 +68,24 @@ the functionality of the installed glib-networking package.
%files -f %{name}.lang %files -f %{name}.lang
%license COPYING %license COPYING
%doc NEWS README %doc NEWS README
%{_libdir}/gio/modules/libgiolibproxy.so
%{_libdir}/gio/modules/libgiognomeproxy.so %{_libdir}/gio/modules/libgiognomeproxy.so
%{_libdir}/gio/modules/libgiognutls.so %{_libdir}/gio/modules/libgiognutls.so
%if 0%{?with_libproxy}
%{_libdir}/gio/modules/libgiolibproxy.so
%{_libexecdir}/glib-pacrunner %{_libexecdir}/glib-pacrunner
%{_datadir}/dbus-1/services/org.gtk.GLib.PACRunner.service %{_datadir}/dbus-1/services/org.gtk.GLib.PACRunner.service
%{_userunitdir}/glib-pacrunner.service %{_userunitdir}/glib-pacrunner.service
%endif
%files tests %files tests
%{_libexecdir}/installed-tests/glib-networking %{_libexecdir}/installed-tests/glib-networking
%{_datadir}/installed-tests %{_datadir}/installed-tests
%changelog %changelog
* Mon Jun 07 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.1-2
- Disable libproxy in RHEL
- Resolves: #1968554
* Mon May 03 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.1-1 * Mon May 03 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.68.1-1
- Update to 2.68.1 - Update to 2.68.1
- Resolves: #1947188 - Resolves: #1947188