[packages/mate-menus] up to 1.22.0

[atler]

commit f0912e53ac19c256f7ec71e16b1addeb1d7384a3
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Mar 18 20:47:39 2019 +0100

    up to 1.22.0

 mate-menus.spec              | 27 ++++-----------------------
 xdg-menu-prefix-compat.patch | 26 ++++++++------------------
 2 files changed, 12 insertions(+), 41 deletions(-)
---
diff --git a/mate-menus.spec b/mate-menus.spec
index 5ba9589..b03376e 100644
--- a/mate-menus.spec
+++ b/mate-menus.spec
@@ -1,13 +1,13 @@
 Summary:	Displays menus for MATE Desktop
 Summary(pl.UTF-8):	Wyświetlanie menu w środowisku MATE Desktop
 Name:		mate-menus
-Version:	1.20.2
+Version:	1.22.0
 Release:	1
 # only (unpackaged) python example is GPL
 License:	LGPL v2+
 Group:		X11/Applications
-Source0:	http://pub.mate-desktop.org/releases/1.20/%{name}-%{version}.tar.xz
-# Source0-md5:	94adb0b2c01ca468b05b833e3e744d05
+Source0:	http://pub.mate-desktop.org/releases/1.22/%{name}-%{version}.tar.xz
+# Source0-md5:	8210063cf56ea7b6a9ac3411507ee0a4
 Patch0:		xdg-menu-prefix-compat.patch
 URL:		http://wiki.mate-desktop.org/mate-menus
 BuildRequires:	autoconf >= 2.62
@@ -19,11 +19,10 @@ BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libtool >= 1:1.4.3
 BuildRequires:	mate-common >= 1.5
 BuildRequires:	pkgconfig
-BuildRequires:	python-devel >= 1:2.7
-BuildRequires:	rpm-pythonprov
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 Requires:	%{name}-libs = %{version}-%{release}
+Obsoletes:	python-matemenu < 1.22.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -57,18 +56,6 @@ Development files for libmate-menu library.
 %description devel -l pl.UTF-8
 Pliki programistyczne biblioteki libmate-menu.
 
-%package -n python-matemenu
-Summary:	Python binding for mate-menus library
-Summary(pl.UTF-8):	Wiązanie Pythona do biblioteki mate-menus
-Group:		Libraries/Python
-Requires:	%{name}-libs = %{version}-%{release}
-
-%description -n python-matemenu
-Python binding for mate-menus library.
-
-%description -n python-matemenu -l pl.UTF-8
-Wiązanie Pythona do biblioteki mate-menus.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -82,7 +69,6 @@ Wiązanie Pythona do biblioteki mate-menus.
 %{__automake}
 %configure \
 	--enable-introspection \
-	--enable-python \
 	--disable-silent-rules \
 	--disable-static
 
@@ -94,7 +80,6 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libmate-menu.la
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/matemenu.la
 # just example
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/mate-menus/examples
 # empty dir
@@ -130,7 +115,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0/MateMenu-2.0.gir
 %{_includedir}/mate-menus
 %{_pkgconfigdir}/libmate-menu.pc
-
-%files -n python-matemenu
-%defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/matemenu.so
diff --git a/xdg-menu-prefix-compat.patch b/xdg-menu-prefix-compat.patch
index affb745..df5c6be 100644
--- a/xdg-menu-prefix-compat.patch
+++ b/xdg-menu-prefix-compat.patch
@@ -12,15 +12,6 @@ additionally load mate-applications.menu if XDG_MENU_PREFIX is not set, as this
 is how we package mate applications.menu.
 --- mate-menus-1.5.0/./libmenu/matemenu-tree.c~	2012-10-11 11:26:03.000000000 +0300
 +++ mate-menus-1.5.0/./libmenu/matemenu-tree.c	2013-01-15 23:41:33.733159313 +0200
-@@ -539,7 +539,7 @@
- 	{
- 		matemenu_tree_remove_menu_file_monitors (tree);
- 
--		if (strcmp(tree->basename, "mate-applications.menu") == 0 && g_getenv("XDG_MENU_PREFIX"))
-+		if (strcmp(tree->basename, "applications.menu") == 0 && g_getenv("XDG_MENU_PREFIX"))
- 		{
- 			char* prefixed_basename;
- 			prefixed_basename = g_strdup_printf("%s%s", g_getenv("XDG_MENU_PREFIX"), tree->basename);
 @@ -1895,7 +1895,7 @@
  	found = FALSE;
  	menu_file = g_strconcat(menu_name, ".menu", NULL);
@@ -30,18 +21,17 @@ is how we package mate applications.menu.
  	{
  		char* prefixed_basename;
  		prefixed_basename = g_strdup_printf("%s%s", g_getenv("XDG_MENU_PREFIX"), menu_file);
---- mate-menus-1.5.0/util/test-menu-spec.c~	2012-10-11 11:26:03.000000000 +0300
-+++ mate-menus-1.5.0/util/test-menu-spec.c	2013-01-15 23:36:26.719020435 +0200
-@@ -191,8 +191,7 @@
- 		flags |= MATEMENU_TREE_FLAGS_INCLUDE_NODISPLAY;
- 	}
- 
--	// Usamos applications.menu is existe. Para compatibilidad con GNOME
--	MateMenuTree* tree = matemenu_tree_lookup(menu_file ? menu_file : "mate-applications.menu", flags);
-+	MateMenuTree* tree = matemenu_tree_lookup(menu_file ? menu_file : "applications.menu", flags);
+--- mate-menus-1.22.0/util/test-menu-spec.c.orig	2019-03-18 20:37:19.227541031 +0100
++++ mate-menus-1.22.0/util/test-menu-spec.c	2019-03-18 20:38:44.433638632 +0100
+@@ -216,7 +216,7 @@
+ 	if (include_unallocated)
+ 		flags |= MATEMENU_TREE_FLAGS_INCLUDE_UNALLOCATED;
  
+-	tree = matemenu_tree_new(menu_file ? menu_file : "mate-applications.menu", flags);
++	tree = matemenu_tree_new(menu_file ? menu_file : "applications.menu", flags);
  	g_assert(tree != NULL);
  
+ 	if (!matemenu_tree_load_sync (tree, &error))
 --- mate-menus-1.5.0/util/mate-menus-ls.py~	2012-10-11 11:26:03.000000000 +0300
 +++ mate-menus-1.5.0/util/mate-menus-ls.py	2013-01-15 23:37:38.595663893 +0200
 @@ -72,7 +72,7 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mate-menus.git/commitdiff/f0912e53ac19c256f7ec71e16b1addeb1d7384a3