From 3893876bdde7d75335e1488ae0e5bd8e76a65e0d Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Jul 27 2019 01:27:37 +0000
Subject: Drop compat library, which might be causing problems


---

diff --git a/gnome-desktop3.spec b/gnome-desktop3.spec
index d7ba899..1b700f1 100644
--- a/gnome-desktop3.spec
+++ b/gnome-desktop3.spec
@@ -6,7 +6,7 @@
 
 Name: gnome-desktop3
 Version: 3.33.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Library with common API for various GNOME modules
 
 License: GPLv2+ and LGPLv2+
@@ -28,8 +28,6 @@ BuildRequires: pkgconfig(iso-codes)
 BuildRequires: pkgconfig(libseccomp)
 BuildRequires: pkgconfig(libudev)
 BuildRequires: pkgconfig(xkeyboard-config)
-# For temporary ABI compat
-BuildRequires: gnome-desktop3
 
 %if !0%{?flatpak}
 Requires: bubblewrap
@@ -39,13 +37,8 @@ Requires: glib2%{?_isa} >= %{glib2_version}
 # needed for GnomeWallClock
 Requires: gsettings-desktop-schemas >= %{gsettings_desktop_schemas_version}
 
-# GnomeIdleMonitor API change breaks older gnome-shell versions
-Conflicts: gnome-shell < 3.7.90
-
-%if 0%{?fedora}
-# From rhughes-f20-gnome-3-12 copr
-Obsoletes: compat-gnome-desktop310 < 3.12
-%endif
+# GnomeBGSlideShow API change breaks older gnome-shell versions
+Conflicts: gnome-shell < 3.33.4
 
 %description
 gnome-desktop contains the libgnome-desktop library as well as a data
@@ -84,9 +77,6 @@ the functionality of the installed %{name} package.
 %install
 %meson_install
 
-# For temporary ABI compat
-cp -a %{_libdir}/libgnome-desktop-3.so.17{,.*} $RPM_BUILD_ROOT%{_libdir}
-
 %find_lang %{po_package} --all-name --with-gnome
 
 %files -f %{po_package}.lang
@@ -95,7 +85,6 @@ cp -a %{_libdir}/libgnome-desktop-3.so.17{,.*} $RPM_BUILD_ROOT%{_libdir}
 %{_datadir}/gnome/gnome-version.xml
 %{_libexecdir}/gnome-rr-debug
 # LGPL
-%{_libdir}/libgnome-desktop-3.so.17{,.*}
 %{_libdir}/libgnome-desktop-3.so.18{,.*}
 %{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib
 
@@ -113,6 +102,9 @@ cp -a %{_libdir}/libgnome-desktop-3.so.17{,.*} $RPM_BUILD_ROOT%{_libdir}
 %{_datadir}/installed-tests
 
 %changelog
+* Fri Jul 26 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 3.33.4-3
+- Drop compat library, which might be causing problems
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.33.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild