swallow up redhat-menus (backport of rhel-8.2.0 change)

Resolves: #1715890
This commit is contained in:
Tomas Popela 2021-03-16 15:52:53 +01:00
parent 10d0c95739
commit 7f4e1b9ffd

View File

@ -2,7 +2,7 @@
Name: gnome-menus Name: gnome-menus
Version: 3.36.0 Version: 3.36.0
Release: 4%{?dist} Release: 5%{?dist}
Summary: A menu system for the GNOME project Summary: A menu system for the GNOME project
License: LGPLv2+ License: LGPLv2+
@ -21,6 +21,9 @@ BuildRequires: make
Requires: redhat-menus Requires: redhat-menus
Obsoletes: redhat-menus < 12.0.2-19
Provides: redhat-menus = 12.0.2-19
%description %description
gnome-menus is an implementation of the draft "Desktop gnome-menus is an implementation of the draft "Desktop
Menu Specification" from freedesktop.org. This package Menu Specification" from freedesktop.org. This package
@ -54,6 +57,7 @@ writing applications that use the GNOME menu system.
%install %install
%make_install %make_install
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
cp $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/{gnome-,}applications.menu
%find_lang gnome-menus %find_lang gnome-menus
@ -63,6 +67,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%license COPYING.LIB %license COPYING.LIB
%doc AUTHORS NEWS %doc AUTHORS NEWS
%{_sysconfdir}/xdg/menus/gnome-applications.menu %{_sysconfdir}/xdg/menus/gnome-applications.menu
%{_sysconfdir}/xdg/menus/applications.menu
%{_libdir}/lib*.so.* %{_libdir}/lib*.so.*
%{_datadir}/desktop-directories/* %{_datadir}/desktop-directories/*
%dir %{_libdir}/girepository-1.0 %dir %{_libdir}/girepository-1.0
@ -76,6 +81,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_datadir}/gir-1.0/GMenu-3.0.gir %{_datadir}/gir-1.0/GMenu-3.0.gir
%changelog %changelog
* Tue Mar 16 2021 Tomas Popela <tpopela@redhat.com> - 3.36.0-5
- swallow up redhat-menus (backport of rhel-8.2.0 change)
Resolves: #1715890
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-4 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild