PR#2: Provide redhat-menus in RHEL builds - rpms/gnome-menus

rpms / gnome-menus

#2 Provide redhat-menus in RHEL builds

Merged a year ago by rstrode. Opened a year ago by yselkowitz.

rpms/ yselkowitz/gnome-menus rawhide into rawhide

Provide redhat-menus in RHEL builds

Yaakov Selkowitz • a year ago

4059b25

gnome-menus.spec

file modified

+14

		`@@ -19,7 +19,13 @@`
		`BuildRequires: gobject-introspection-devel`
		`BuildRequires: make`

		`+ %if %{defined rhel}`
		`+ Obsoletes: redhat-menus < 12.0.2-24`
		`+ Provides: redhat-menus = 12.0.2-24`
		`+ Conflicts: redhat-menus < 12.0.2-24`
		`+ %else`
		`Requires: redhat-menus`
		`+ %endif`

		`%description`
		`gnome-menus is an implementation of the draft "Desktop`
		`@@ -54,6 +60,10 @@`
		`%install`
		`%make_install`
		`find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'`
		`+ %if %{defined rhel}`
		`+ cp $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/{gnome-,}applications.menu`
		`+ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged`
		`+ %endif`

		`%find_lang gnome-menus`

		`@@ -63,6 +73,10 @@`
		`%license COPYING.LIB`
		`%doc AUTHORS NEWS`
		`%{_sysconfdir}/xdg/menus/gnome-applications.menu`
		`+ %if %{defined rhel}`
		`+ %{_sysconfdir}/xdg/menus/applications.menu`
		`+ %dir %{_sysconfdir}/xdg/menus/applications-merged`
		`+ %endif`
		`%{_libdir}/lib.so.`
		`%{_datadir}/desktop-directories/*`
		`%dir %{_libdir}/girepository-1.0`

yselkowitz commented a year ago

The separate redhat-menus package is unwanted in RHEL/ELN. This is a forward port of the C9S changes:

https://gitlab.com/redhat/centos-stream/rpms/gnome-menus/-/commit/7f4e1b9ffdd40e4711fa50ff730d7270c883e7ed
https://gitlab.com/redhat/centos-stream/rpms/gnome-menus/-/commit/044cad682ec2b19b753f710416a0936a3a7178fa

catanzaro commented a year ago

@rstrode this looks like one for you. It seems correct to upstream the changes from c9s, but also pretty weird that we have a redhat-menus package only in Fedora?

catanzaro commented a year ago

@tpopela

tpopela commented a year ago

@catanzaro I've just backported https://bugzilla.redhat.com/show_bug.cgi?id=1715890 / https://pkgs.devel.redhat.com/cgit/rpms/gnome-menus/commit/?h=rhel-8.2.0&id=09a986252999f485779b177734db670ffd17b0a5 into RHEL 9. I will leave this one on Ray to say what we should do.

yselkowitz commented a year ago

ping @rstrode

rstrode commented a year ago

in RHEL we use GNOME and GNOME doesn't use redhat-menus. It uses gnome-menus instead (/etc/xdg/menus/gnome-applications.menu et al). We do make gnome-menus provide a small layer of backward compatibility by shipping /etc/xdg/menus/applications.menu too in case there's a third party desktop environment in EPEL or something. We may do future improvements to that compatibility too (see https://bugzilla.redhat.com/show_bug.cgi?id=2125685 )

In Fedora, there are non-GNOME desktop environments that probably rely on redhat-menus to get /etc/xdg/menus/applications.menu et al so redhat-menus remains.

Putting the rhel stuff in fedora will make sure it doesn't fall through the cracks next rhel, so it's probably a good idea.

rstrode commented a year ago

Do you mind adding a rhel only mkdir -p /etc/xdg/menus/applications-merged to your list of changes ?

rebased onto 4059b25

a year ago

yselkowitz commented a year ago

Modified.