Drop compat library, which might be causing problems

This commit is contained in:
Michael Catanzaro 2019-07-26 20:27:37 -05:00
parent f0818069f1
commit 3893876bdd

View File

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