From bb0eab3abdb68f1646967220071254cea17a3f6c Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Fri, 21 Jul 2023 09:18:00 -0500 Subject: [PATCH] Remove the libsoup 2 build No Obsoletes or Provides because the new API is not compatible with the old API and does not replace it. The old version is just abandoned. This is only needed by the original libgweather package, which is itself no longer needed by anything. --- geocode-glib.spec | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/geocode-glib.spec b/geocode-glib.spec index 9f28db9..c6df8ee 100644 --- a/geocode-glib.spec +++ b/geocode-glib.spec @@ -1,5 +1,3 @@ -%bcond soup2 %[%{undefined rhel} || 0%{?rhel} < 10] - %global json_glib_version 0.99.2 Name: geocode-glib @@ -17,9 +15,6 @@ BuildRequires: meson BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(json-glib-1.0) >= %{json_glib_version} -%if %{with soup2} -BuildRequires: pkgconfig(libsoup-2.4) -%endif BuildRequires: pkgconfig(libsoup-3.0) Requires: json-glib%{?_isa} >= %{json_glib_version} @@ -71,43 +66,12 @@ developing applications that use %{name}. %prep %setup -q - %build -%if %{with soup2} -%define _vpath_builddir %{_vendor}-%{_target_os}-build-soup2 -%meson -Denable-installed-tests=false -%meson_build -%endif - -%define _vpath_builddir %{_vendor}-%{_target_os}-build-soup3 %meson -Denable-installed-tests=false -Dsoup2=false %meson_build - %install -%if %{with soup2} -%define _vpath_builddir %{_vendor}-%{_target_os}-build-soup2 %meson_install -%endif - -%define _vpath_builddir %{_vendor}-%{_target_os}-build-soup3 -%meson_install - - -%if %{with soup2} -%files -%license COPYING.LIB -%doc AUTHORS NEWS README -%{_libdir}/libgeocode-glib.so.0* -%{_libdir}/girepository-1.0/GeocodeGlib-1.0.typelib - -%files devel -%{_includedir}/geocode-glib-1.0/ -%{_libdir}/libgeocode-glib.so -%{_libdir}/pkgconfig/geocode-glib-1.0.pc -%{_datadir}/gir-1.0/GeocodeGlib-1.0.gir -%doc %{_datadir}/gtk-doc/ -%endif %files data %{_datadir}/icons/hicolor/scalable/places/*.svg