Compare commits
No commits in common. "c8" and "c9" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/gnome-menus-3.13.3.tar.xz
|
SOURCES/gnome-menus-3.36.0.tar.xz
|
||||||
|
1
.gnome-menus.metadata
Normal file
1
.gnome-menus.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
eb50ed102c3fad77075c7b8f03539f86ebef891f SOURCES/gnome-menus-3.36.0.tar.xz
|
56
SOURCES/14.patch
Normal file
56
SOURCES/14.patch
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
From f18150d68204f2a23f4874e45363df1112fd1620 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kalev Lember <klember@redhat.com>
|
||||||
|
Date: Fri, 24 Jan 2020 08:11:24 +0100
|
||||||
|
Subject: [PATCH] layout: Update eog desktop filename
|
||||||
|
|
||||||
|
Fixes: https://gitlab.gnome.org/GNOME/gnome-menus/issues/14
|
||||||
|
---
|
||||||
|
layout/gnome-applications.menu | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
|
||||||
|
index f8d3d48..03855c5 100644
|
||||||
|
--- a/layout/gnome-applications.menu
|
||||||
|
+++ b/layout/gnome-applications.menu
|
||||||
|
@@ -33,12 +33,12 @@
|
||||||
|
<!-- Exclude everything we put in the X-GNOME-Utilities whitelist.
|
||||||
|
|
||||||
|
Please keep the list alphabetically sorted! -->
|
||||||
|
- <Filename>eog.desktop</Filename>
|
||||||
|
<Filename>gucharmap.desktop</Filename>
|
||||||
|
<Filename>org.gnome.Calculator.desktop</Filename>
|
||||||
|
<Filename>org.gnome.DejaDup.desktop</Filename>
|
||||||
|
<Filename>org.gnome.Dictionary.desktop</Filename>
|
||||||
|
<Filename>org.gnome.DiskUtility.desktop</Filename>
|
||||||
|
+ <Filename>org.gnome.eog.desktop</Filename>
|
||||||
|
<Filename>org.gnome.Evince.desktop</Filename>
|
||||||
|
<Filename>org.gnome.FileRoller.desktop</Filename>
|
||||||
|
<Filename>org.gnome.font-viewer.desktop</Filename>
|
||||||
|
@@ -108,7 +108,7 @@
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Graphics</Category>
|
||||||
|
- <Not><Filename>eog.desktop</Filename></Not>
|
||||||
|
+ <Not><Filename>org.gnome.eog.desktop</Filename></Not>
|
||||||
|
<Not><Filename>org.gnome.Evince.desktop</Filename></Not>
|
||||||
|
<Not><Filename>simple-scan.desktop</Filename></Not>
|
||||||
|
</And>
|
||||||
|
@@ -206,7 +206,6 @@
|
||||||
|
<Directory>X-GNOME-Utilities.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<Category>X-GNOME-Utilities</Category>
|
||||||
|
- <Filename>eog.desktop</Filename>
|
||||||
|
<Filename>gnome-abrt.desktop</Filename>
|
||||||
|
<Filename>gnome-system-log.desktop</Filename>
|
||||||
|
<Filename>gnome-system-monitor.desktop</Filename>
|
||||||
|
@@ -217,6 +216,7 @@
|
||||||
|
<Filename>org.gnome.DejaDup.desktop</Filename>
|
||||||
|
<Filename>org.gnome.Dictionary.desktop</Filename>
|
||||||
|
<Filename>org.gnome.DiskUtility.desktop</Filename>
|
||||||
|
+ <Filename>org.gnome.eog.desktop</Filename>
|
||||||
|
<Filename>org.gnome.Evince.desktop</Filename>
|
||||||
|
<Filename>org.gnome.FileRoller.desktop</Filename>
|
||||||
|
<Filename>org.gnome.fonts.desktop</Filename>
|
||||||
|
--
|
||||||
|
2.24.1
|
||||||
|
|
87
SOURCES/4.patch
Normal file
87
SOURCES/4.patch
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
From f18150d68204f2a23f4874e45363df1112fd1620 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ray Strode <rstrode@redhat.com>
|
||||||
|
Date: Web, 17 Apr 2024 22:58:24 -0400
|
||||||
|
Subject: [PATCH] layout: Move menu items around to be more logical
|
||||||
|
|
||||||
|
Fixes: https://gitlab.gnome.org/GNOME/gnome-menus/issues/15
|
||||||
|
---
|
||||||
|
layout/gnome-applications.menu | 6 +++---
|
||||||
|
|
||||||
|
diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
|
||||||
|
index f8d3d48..03855c5 100644
|
||||||
|
--- a/layout/gnome-applications.menu
|
||||||
|
+++ b/layout/gnome-applications.menu
|
||||||
|
@@ -28,6 +28,7 @@
|
||||||
|
<Not><Category>System</Category></Not>
|
||||||
|
<Not><Category>X-GNOME-Utilities</Category></Not>
|
||||||
|
</And>
|
||||||
|
+ <Filename>org.gnome.Tour.desktop</Filename>
|
||||||
|
</Include>
|
||||||
|
<Exclude>
|
||||||
|
<!-- Exclude everything we put in the X-GNOME-Utilities whitelist.
|
||||||
|
@@ -40,6 +41,7 @@
|
||||||
|
<Filename>org.gnome.DiskUtility.desktop</Filename>
|
||||||
|
<Filename>org.gnome.eog.desktop</Filename>
|
||||||
|
<Filename>org.gnome.Evince.desktop</Filename>
|
||||||
|
+ <Filename>org.gnome.Extensions.desktop</Filename>
|
||||||
|
<Filename>org.gnome.FileRoller.desktop</Filename>
|
||||||
|
<Filename>org.gnome.font-viewer.desktop</Filename>
|
||||||
|
<Filename>org.gnome.Screenshot.desktop</Filename>
|
||||||
|
@@ -178,16 +180,18 @@
|
||||||
|
<Not><Category>Settings</Category></Not>
|
||||||
|
<Not><Category>X-GNOME-Utilities</Category></Not>
|
||||||
|
</And>
|
||||||
|
+ <Filename>gnome-system-monitor.desktop</Filename>
|
||||||
|
+ <Filename>org.gnome.baobab.desktop</Filename>
|
||||||
|
+ <Filename>org.gnome.DiskUtility.desktop</Filename>
|
||||||
|
+ <Filename>org.gnome.Software.desktop</Filename>
|
||||||
|
+ <Filename>org.gnome.Usage.desktop</Filename>
|
||||||
|
</Include>
|
||||||
|
|
||||||
|
<Exclude>
|
||||||
|
<!-- Utilities exclusions -->
|
||||||
|
<Filename>gnome-abrt.desktop</Filename>
|
||||||
|
<Filename>gnome-system-log.desktop</Filename>
|
||||||
|
- <Filename>gnome-system-monitor.desktop</Filename>
|
||||||
|
- <Filename>org.gnome.baobab.desktop</Filename>
|
||||||
|
<Filename>org.gnome.Terminal.desktop</Filename>
|
||||||
|
- <Filename>org.gnome.Usage.desktop</Filename>
|
||||||
|
</Exclude>
|
||||||
|
</Menu> <!-- End System Tools -->
|
||||||
|
|
||||||
|
@@ -207,28 +211,31 @@
|
||||||
|
<Include>
|
||||||
|
<Category>X-GNOME-Utilities</Category>
|
||||||
|
<Filename>gnome-abrt.desktop</Filename>
|
||||||
|
+ <Filename>gnome-control-center.desktop</Filename>
|
||||||
|
<Filename>gnome-system-log.desktop</Filename>
|
||||||
|
- <Filename>gnome-system-monitor.desktop</Filename>
|
||||||
|
<Filename>gucharmap.desktop</Filename>
|
||||||
|
<Filename>nm-connection-editor.desktop</Filename>
|
||||||
|
- <Filename>org.gnome.baobab.desktop</Filename>
|
||||||
|
<Filename>org.gnome.Calculator.desktop</Filename>
|
||||||
|
<Filename>org.gnome.DejaDup.desktop</Filename>
|
||||||
|
<Filename>org.gnome.Dictionary.desktop</Filename>
|
||||||
|
- <Filename>org.gnome.DiskUtility.desktop</Filename>
|
||||||
|
<Filename>org.gnome.eog.desktop</Filename>
|
||||||
|
<Filename>org.gnome.Evince.desktop</Filename>
|
||||||
|
+ <Filename>org.gnome.Extensions.desktop</Filename>
|
||||||
|
<Filename>org.gnome.FileRoller.desktop</Filename>
|
||||||
|
<Filename>org.gnome.fonts.desktop</Filename>
|
||||||
|
<Filename>org.gnome.Screenshot.desktop</Filename>
|
||||||
|
<Filename>org.gnome.seahorse.Application.desktop</Filename>
|
||||||
|
<Filename>org.gnome.Terminal.desktop</Filename>
|
||||||
|
<Filename>org.gnome.tweaks.desktop</Filename>
|
||||||
|
- <Filename>org.gnome.Usage.desktop</Filename>
|
||||||
|
<Filename>simple-scan.desktop</Filename>
|
||||||
|
<Filename>vinagre.desktop</Filename>
|
||||||
|
<Filename>yelp.desktop</Filename>
|
||||||
|
</Include>
|
||||||
|
+ <Exclude>
|
||||||
|
+ <Filename>org.gnome.baobab.desktop</Filename>
|
||||||
|
+ <Filename>org.gnome.DiskUtility.desktop</Filename>
|
||||||
|
+ <Filename>org.gnome.Usage.desktop</Filename>
|
||||||
|
+ </Exclude>
|
||||||
|
</Menu>
|
||||||
|
|
||||||
|
<!-- Other -->
|
@ -1,200 +0,0 @@
|
|||||||
From b4546ab43c2c7ef6fb6cb7e5db83dc3975b56e8e Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
|
|
||||||
Date: Mon, 27 Oct 2014 18:41:34 +0200
|
|
||||||
Subject: [PATCH 1/2] desktop-entries: support multiple desktops in
|
|
||||||
XDG_CURRENT_DESKTOP
|
|
||||||
|
|
||||||
This is based on glib commit:
|
|
||||||
5a5e16e93c4f11e635918ecdb41681f63fd05a39
|
|
||||||
---
|
|
||||||
libmenu/desktop-entries.c | 110 ++++++++++++++++++++++------------------------
|
|
||||||
1 file changed, 52 insertions(+), 58 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c
|
|
||||||
index 326f311..bd4f886 100644
|
|
||||||
--- a/libmenu/desktop-entries.c
|
|
||||||
+++ b/libmenu/desktop-entries.c
|
|
||||||
@@ -85,32 +85,27 @@ unix_basename_from_path (const char *path)
|
|
||||||
return path;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static const char *
|
|
||||||
-get_current_desktop (void)
|
|
||||||
+static const gchar * const *
|
|
||||||
+get_current_desktops (void)
|
|
||||||
{
|
|
||||||
- static char *current_desktop = NULL;
|
|
||||||
+ static gchar **result;
|
|
||||||
|
|
||||||
- /* Support XDG_CURRENT_DESKTOP environment variable; this can be used
|
|
||||||
- * to abuse gnome-menus in non-GNOME desktops. */
|
|
||||||
- if (!current_desktop)
|
|
||||||
+ if (g_once_init_enter (&result))
|
|
||||||
{
|
|
||||||
- const char *desktop;
|
|
||||||
+ const gchar *desktops;
|
|
||||||
+ gchar **tmp;
|
|
||||||
|
|
||||||
- desktop = g_getenv ("XDG_CURRENT_DESKTOP");
|
|
||||||
+ desktops = g_getenv ("XDG_CURRENT_DESKTOP");
|
|
||||||
|
|
||||||
- /* Note: if XDG_CURRENT_DESKTOP is set but empty, do as if it
|
|
||||||
- * was not set */
|
|
||||||
- if (!desktop || desktop[0] == '\0')
|
|
||||||
- current_desktop = g_strdup ("GNOME");
|
|
||||||
- else
|
|
||||||
- current_desktop = g_strdup (desktop);
|
|
||||||
- }
|
|
||||||
+ if (desktops)
|
|
||||||
+ desktops = "";
|
|
||||||
|
|
||||||
- /* Using "*" means skipping desktop-related checks */
|
|
||||||
- if (g_strcmp0 (current_desktop, "*") == 0)
|
|
||||||
- return NULL;
|
|
||||||
+ tmp = g_strsplit (desktops, ":", 0);
|
|
||||||
+
|
|
||||||
+ g_once_init_leave (&result, tmp);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- return current_desktop;
|
|
||||||
+ return (const gchar **) result;
|
|
||||||
}
|
|
||||||
|
|
||||||
static GIcon *
|
|
||||||
@@ -151,52 +146,58 @@ key_file_get_icon (GKeyFile *key_file)
|
|
||||||
static gboolean
|
|
||||||
key_file_get_show_in (GKeyFile *key_file)
|
|
||||||
{
|
|
||||||
- const gchar *current_desktop;
|
|
||||||
- gchar **strv;
|
|
||||||
+ const gchar * const *current_desktops;
|
|
||||||
+ gchar **only_show_in;
|
|
||||||
+ gchar **not_show_in;
|
|
||||||
gboolean show_in = TRUE;
|
|
||||||
- int i;
|
|
||||||
-
|
|
||||||
- current_desktop = get_current_desktop ();
|
|
||||||
- if (!current_desktop)
|
|
||||||
- return TRUE;
|
|
||||||
-
|
|
||||||
- strv = g_key_file_get_string_list (key_file,
|
|
||||||
- DESKTOP_ENTRY_GROUP,
|
|
||||||
- "OnlyShowIn",
|
|
||||||
- NULL,
|
|
||||||
- NULL);
|
|
||||||
- if (strv)
|
|
||||||
+ gint i;
|
|
||||||
+
|
|
||||||
+ current_desktops = get_current_desktops ();
|
|
||||||
+ only_show_in = g_key_file_get_string_list (key_file,
|
|
||||||
+ DESKTOP_ENTRY_GROUP,
|
|
||||||
+ "OnlyShowIn",
|
|
||||||
+ NULL,
|
|
||||||
+ NULL);
|
|
||||||
+ not_show_in = g_key_file_get_string_list (key_file,
|
|
||||||
+ DESKTOP_ENTRY_GROUP,
|
|
||||||
+ "NotShowIn",
|
|
||||||
+ NULL,
|
|
||||||
+ NULL);
|
|
||||||
+
|
|
||||||
+ for (i = 0; current_desktops[i]; i++)
|
|
||||||
{
|
|
||||||
- show_in = FALSE;
|
|
||||||
- for (i = 0; strv[i]; i++)
|
|
||||||
+ gint j;
|
|
||||||
+
|
|
||||||
+ if (only_show_in)
|
|
||||||
{
|
|
||||||
- if (!strcmp (strv[i], current_desktop))
|
|
||||||
+ show_in = FALSE;
|
|
||||||
+ for (j = 0; only_show_in[j]; j++)
|
|
||||||
{
|
|
||||||
- show_in = TRUE;
|
|
||||||
- break;
|
|
||||||
+ if (g_str_equal (only_show_in[j], current_desktops[i]))
|
|
||||||
+ {
|
|
||||||
+ show_in = TRUE;
|
|
||||||
+ goto out;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- }
|
|
||||||
- else
|
|
||||||
- {
|
|
||||||
- strv = g_key_file_get_string_list (key_file,
|
|
||||||
- DESKTOP_ENTRY_GROUP,
|
|
||||||
- "NotShowIn",
|
|
||||||
- NULL,
|
|
||||||
- NULL);
|
|
||||||
- if (strv)
|
|
||||||
+
|
|
||||||
+ if (not_show_in)
|
|
||||||
{
|
|
||||||
show_in = TRUE;
|
|
||||||
- for (i = 0; strv[i]; i++)
|
|
||||||
+ for (j = 0; not_show_in[j]; j++)
|
|
||||||
{
|
|
||||||
- if (!strcmp (strv[i], current_desktop))
|
|
||||||
+ if (g_str_equal (not_show_in[j], current_desktops[i]))
|
|
||||||
{
|
|
||||||
show_in = FALSE;
|
|
||||||
+ goto out;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- g_strfreev (strv);
|
|
||||||
+
|
|
||||||
+out:
|
|
||||||
+ g_strfreev (only_show_in);
|
|
||||||
+ g_strfreev (not_show_in);
|
|
||||||
|
|
||||||
return show_in;
|
|
||||||
}
|
|
||||||
@@ -579,14 +580,7 @@ gboolean
|
|
||||||
desktop_entry_get_show_in (DesktopEntry *entry)
|
|
||||||
{
|
|
||||||
if (entry->type == DESKTOP_ENTRY_DESKTOP)
|
|
||||||
- {
|
|
||||||
- const char *current_desktop = get_current_desktop ();
|
|
||||||
-
|
|
||||||
- if (current_desktop == NULL)
|
|
||||||
- return TRUE;
|
|
||||||
- else
|
|
||||||
- return g_desktop_app_info_get_show_in (((DesktopEntryDesktop*)entry)->appinfo, current_desktop);
|
|
||||||
- }
|
|
||||||
+ return g_desktop_app_info_get_show_in (((DesktopEntryDesktop*)entry)->appinfo, NULL);
|
|
||||||
return ((DesktopEntryDirectory*)entry)->showin;
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.4.3
|
|
||||||
|
|
||||||
|
|
||||||
From 4befe76fbdb76aa6a986297ef71d1601b2ced42e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Josselin Mouette <joss@debian.org>
|
|
||||||
Date: Sun, 14 Dec 2014 20:36:36 +0100
|
|
||||||
Subject: [PATCH 2/2] desktop-entries: fix trivial bug in handling of multiple
|
|
||||||
desktops in XDG_CURRENT_DESKTOP.
|
|
||||||
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=741505
|
|
||||||
---
|
|
||||||
libmenu/desktop-entries.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c
|
|
||||||
index bd4f886..a463d79 100644
|
|
||||||
--- a/libmenu/desktop-entries.c
|
|
||||||
+++ b/libmenu/desktop-entries.c
|
|
||||||
@@ -97,7 +97,7 @@ get_current_desktops (void)
|
|
||||||
|
|
||||||
desktops = g_getenv ("XDG_CURRENT_DESKTOP");
|
|
||||||
|
|
||||||
- if (desktops)
|
|
||||||
+ if (!desktops)
|
|
||||||
desktops = "";
|
|
||||||
|
|
||||||
tmp = g_strsplit (desktops, ":", 0);
|
|
||||||
--
|
|
||||||
2.4.3
|
|
||||||
|
|
@ -1,39 +1,40 @@
|
|||||||
%global enable_debugging 0
|
%global enable_debugging 0
|
||||||
|
|
||||||
Summary: A menu system for the GNOME project
|
|
||||||
Name: gnome-menus
|
Name: gnome-menus
|
||||||
Version: 3.13.3
|
Version: 3.36.0
|
||||||
Release: 12%{?dist}
|
Release: 9%{?dist}
|
||||||
|
Summary: A menu system for the GNOME project
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: System Environment/Libraries
|
URL: https://gitlab.gnome.org/GNOME/gnome-menus
|
||||||
URL: http://www.gnome.org/
|
Source0: https://download.gnome.org/sources/gnome-menus/3.36/%{name}-%{version}.tar.xz
|
||||||
|
# https://gitlab.gnome.org/GNOME/gnome-menus/merge_requests/14
|
||||||
|
# Puts eog back to the Utilities submenu
|
||||||
|
Patch0: 14.patch
|
||||||
|
# https://gitlab.com/redhat/centos-stream/rpms/gnome-menus/-/merge_requests/4
|
||||||
|
# Move things around a bit to be more logical
|
||||||
|
Patch1: 4.patch
|
||||||
|
|
||||||
#VCS: git:git://git.gnome.org/gnome-menus
|
|
||||||
Source0: http://download.gnome.org/sources/gnome-menus/3.13/%{name}-%{version}.tar.xz
|
|
||||||
|
|
||||||
Patch0: fix-multiple-desktops-in-xdg-current-desktop.patch
|
|
||||||
|
|
||||||
Requires: redhat-menus
|
|
||||||
BuildRequires: gawk
|
BuildRequires: gawk
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
BuildRequires: glib2-devel
|
BuildRequires: glib2-devel
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: intltool
|
|
||||||
BuildRequires: gobject-introspection-devel
|
BuildRequires: gobject-introspection-devel
|
||||||
|
BuildRequires: make
|
||||||
|
|
||||||
Obsoletes: redhat-menus < 12.0.2-13
|
Obsoletes: redhat-menus < 12.0.2-20
|
||||||
Provides: redhat-menus = 12.0.2-13
|
Provides: redhat-menus = 12.0.2-20
|
||||||
|
Conflicts: redhat-menus < 12.0.2-20
|
||||||
|
|
||||||
%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
|
||||||
also contains the GNOME menu layout configuration files,
|
also contains the GNOME menu layout configuration files,
|
||||||
.directory files and assorted menu related utility programs,
|
.directory files and assorted menu related utility programs
|
||||||
Python bindings, and a simple menu editor.
|
and a simple menu editor.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Libraries and include files for the GNOME menu system
|
Summary: Libraries and include files for the GNOME menu system
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
@ -42,7 +43,8 @@ writing applications that use the GNOME menu system.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .fix-xdg-current-desktop-handling
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-static \
|
%configure --disable-static \
|
||||||
@ -53,48 +55,99 @@ writing applications that use the GNOME menu system.
|
|||||||
--enable-debug=no
|
--enable-debug=no
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
%make_build
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
|
%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
|
cp $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/{gnome-,}applications.menu
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/{gnome-,}applications-merged
|
|
||||||
|
|
||||||
%find_lang gnome-menus-3.0
|
%find_lang gnome-menus
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
%files -f gnome-menus.lang
|
||||||
|
%license COPYING.LIB
|
||||||
%files -f gnome-menus-3.0.lang
|
%doc AUTHORS NEWS
|
||||||
%doc AUTHORS NEWS COPYING.LIB
|
|
||||||
%{_sysconfdir}/xdg/menus/gnome-applications.menu
|
%{_sysconfdir}/xdg/menus/gnome-applications.menu
|
||||||
%dir %{_sysconfdir}/xdg/menus/gnome-applications-merged
|
|
||||||
%{_sysconfdir}/xdg/menus/applications.menu
|
%{_sysconfdir}/xdg/menus/applications.menu
|
||||||
%dir %{_sysconfdir}/xdg/menus/applications-merged
|
|
||||||
%{_libdir}/lib*.so.*
|
%{_libdir}/lib*.so.*
|
||||||
%{_datadir}/desktop-directories/*
|
%{_datadir}/desktop-directories/*
|
||||||
|
%dir %{_libdir}/girepository-1.0
|
||||||
%{_libdir}/girepository-1.0/GMenu-3.0.typelib
|
%{_libdir}/girepository-1.0/GMenu-3.0.typelib
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_libdir}/lib*.so
|
%{_libdir}/lib*.so
|
||||||
%{_libdir}/pkgconfig/*
|
%{_libdir}/pkgconfig/*
|
||||||
%{_includedir}/gnome-menus-3.0
|
%{_includedir}/gnome-menus-3.0
|
||||||
|
%dir %{_datadir}/gir-1.0
|
||||||
%{_datadir}/gir-1.0/GMenu-3.0.gir
|
%{_datadir}/gir-1.0/GMenu-3.0.gir
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Jul 05 2023 Ray Strode <rstrode@redhat.com> - 3.13.3-12
|
* Wed Apr 17 2024 Ray Strode <rstrode@redhat.com> - 3.36.0-9
|
||||||
- Add -merged directories out of the box
|
- Move things around a bit in the menus to be more logical
|
||||||
Resolves: #2125685
|
Related: RHEL-32792
|
||||||
|
|
||||||
* Fri Dec 06 2019 Ray Strode <rstrode@redhat.com> - 3.13.3-11
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.36.0-8
|
||||||
- swallow up redhat-menus
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.36.0-7
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Wed Mar 17 2021 Tomas Popela <tpopela@redhat.com> - 3.36.0-6
|
||||||
|
- Fix the version of redhat-menus, add Conflicts, remove Requires
|
||||||
|
|
||||||
|
* 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
|
Resolves: #1715890
|
||||||
|
|
||||||
* Fri Aug 03 2018 Charalampos Stratakis <cstratak@redhat.com> - 3.13.3-10
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-4
|
||||||
- Remove python2-devel dependency
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-3
|
||||||
|
- Second attempt - Rebuilt for
|
||||||
|
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Mar 11 2020 Kalev Lember <klember@redhat.com> - 3.36.0-1
|
||||||
|
- Update to 3.36.0
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.35.3-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 24 2020 Adam Williamson <awilliam@redhat.com> - 3.35.3-2
|
||||||
|
- Backport MR #14 to move eog back to Utilities submenu
|
||||||
|
|
||||||
|
* Tue Jan 07 2020 Kalev Lember <klember@redhat.com> - 3.35.3-1
|
||||||
|
- Update to 3.35.3
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Mar 11 2019 Kalev Lember <klember@redhat.com> - 3.32.0-1
|
||||||
|
- Update to 3.32.0
|
||||||
|
|
||||||
|
* Mon Mar 04 2019 Kalev Lember <klember@redhat.com> - 3.31.92-1
|
||||||
|
- Update to 3.31.92
|
||||||
|
|
||||||
|
* Tue Feb 05 2019 Kalev Lember <klember@redhat.com> - 3.31.90-1
|
||||||
|
- Update to 3.31.90
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.31.4-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 23 2019 Kalev Lember <klember@redhat.com> - 3.31.4-1
|
||||||
|
- Update to 3.31.4
|
||||||
|
- Fix gir directory ownership
|
||||||
|
|
||||||
|
* Sun Aug 05 2018 Miro Hrončok <mhroncok@redhat.com> - 3.13.3-11
|
||||||
|
- There is no Python involved anymore
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.3-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.3-9
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.3-9
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
Loading…
Reference in New Issue
Block a user