3 changed files with 6 additions and 98 deletions
--- a/0001-libdbusmenu-add-patch-to-modify-build-err.patch
+++ b/0001-libdbusmenu-add-patch-to-modify-build-err.patch
@ -1,68 +0,0 @@
-From 1785c226570993a6f0cf9fa25f7903ba962cfe52 Mon Sep 17 00:00:00 2001
-From: Buildteam <buildteam@openeuler.org>
-Date: Tue, 14 Jan 2020 09:48:28 +0800
-Subject: [PATCH] libdbusmenu: add patch to modify build err
-
-Signed-off-by: Buildteam <buildteam@openeuler.org>
---
- libdbusmenu-16.04.0/libdbusmenu-glib/Makefile.am | 2 +-
- libdbusmenu-16.04.0/libdbusmenu-gtk/Makefile.am  | 2 +-
- libdbusmenu-16.04.0/tests/Makefile.am            | 2 +-
- libdbusmenu-16.04.0/tools/Makefile.am            | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libdbusmenu-16.04.0/libdbusmenu-glib/Makefile.am b/libdbusmenu-16.04.0/libdbusmenu-glib/Makefile.am
-index 2dea5f6..01832ce 100644
--- a/libdbusmenu-16.04.0/libdbusmenu-glib/Makefile.am
-+++ b/libdbusmenu-16.04.0/libdbusmenu-glib/Makefile.am
-@@ -66,7 +66,7 @@ libdbusmenu_glib_la_LDFLAGS = \
- libdbusmenu_glib_la_CFLAGS = \
- 	$(DBUSMENUGLIB_CFLAGS) \
- 	$(COVERAGE_CFLAGS) \
-	-Wall -Werror -Wno-error=deprecated-declarations \
-+	-Wall -Wno-error=deprecated-declarations \
- 	-DG_LOG_DOMAIN="\"LIBDBUSMENU-GLIB\""
- 
- libdbusmenu_glib_la_LIBADD = \
-diff --git a/libdbusmenu-16.04.0/libdbusmenu-gtk/Makefile.am b/libdbusmenu-16.04.0/libdbusmenu-gtk/Makefile.am
-index 9a7a2b0..a9a2b49 100644
--- a/libdbusmenu-16.04.0/libdbusmenu-gtk/Makefile.am
-+++ b/libdbusmenu-16.04.0/libdbusmenu-gtk/Makefile.am
-@@ -66,7 +66,7 @@ libdbusmenu_gtk_la_CFLAGS = \
- 	$(DBUSMENUGTK_CFLAGS) \
- 	$(COVERAGE_CFLAGS) \
- 	-I$(top_srcdir) \
-	-Wall -Werror -Wno-error=deprecated-declarations \
-+	-Wall -Wno-error=deprecated-declarations \
- 	-DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\""
- 
- libdbusmenu_gtk_la_LIBADD = \
-diff --git a/libdbusmenu-16.04.0/tests/Makefile.am b/libdbusmenu-16.04.0/tests/Makefile.am
-index 64e3e75..699c2c9 100644
--- a/libdbusmenu-16.04.0/tests/Makefile.am
-+++ b/libdbusmenu-16.04.0/tests/Makefile.am
-@@ -103,7 +103,7 @@ TESTS_ENVIRONMENT = env GI_TYPELIB_PATH=$(top_builddir)/libdbusmenu-glib:$(top_b
- ############################################
- 
- DBUSMENU_GLIB_TEST_CFLAGS = \
-	-Wall -Werror \
-+	-Wall \
- 	-DG_DISABLE_DEPRECATED \
- 	-I$(top_srcdir) \
- 	$(DBUSMENUTESTS_CFLAGS) \
-diff --git a/libdbusmenu-16.04.0/tools/Makefile.am b/libdbusmenu-16.04.0/tools/Makefile.am
-index 029b73e..2258cca 100644
--- a/libdbusmenu-16.04.0/tools/Makefile.am
-+++ b/libdbusmenu-16.04.0/tools/Makefile.am
-@@ -16,7 +16,7 @@ dbusmenu_dumper_CFLAGS = \
- 	-I $(srcdir)/.. \
- 	$(DBUSMENUGLIB_CFLAGS) \
- 	$(DBUSMENUDUMPER_CFLAGS) \
-	-Wall -Werror
-+	-Wall
- 
- dbusmenu_dumper_LDADD = \
- 	../libdbusmenu-glib/libdbusmenu-glib.la \
-- 
-1.8.3.1
-
--- a/libdbusmenu.spec
+++ b/libdbusmenu.spec
@ -1,18 +1,16 @@
 Name:           libdbusmenu
 Version:        16.04.0
-Release:        13
+Release:        9
 Summary:        Pass a menu structure across DBus
 License:        LGPLv3 or LGPLv2 and GPLv3
 URL:            https://launchpad.net/libdbusmenu
-Source0:        https://launchpad.net/libdbusmenu/16.04/%{version}/+download/%{name}-%{version}.tar.gz
+Source0:        https://launchpad.net/libdbusmenu/%{ubuntu_release}/%{version}/+download/%{name}-%{version}.tar.gz

-Patch0:         0001-libdbusmenu-add-patch-to-modify-build-err.patch
-
-BuildRequires:  atk-devel autoconf automake gettext glibc-devel gnome-common intltool libtool libxslt gtk-doc
+BuildRequires:  atk-devel autoconf automake gettext glibc-devel gnome-common intltool libtool libxslt
 BuildRequires:  pkgconfig pkgconfig(atk) pkgconfig(gio-2.0) >= 2.35.4 pkgconfig(gio-unix-2.0) >= 2.24
 BuildRequires:  pkgconfig(glib-2.0) >= 2.35.4 pkgconfig(gobject-introspection-1.0) >= 0.10
 BuildRequires:  pkgconfig(gtk+-2.0) >= 2.16 pkgconfig(gtk+-3.0) >= 2.91 pkgconfig(json-glib-1.0) >= 0.13.4
-BuildRequires:  pkgconfig(x11) >= 1.3 python3 vala-devel vala-tools
+BuildRequires:  pkgconfig(x11) >= 1.3 python2 vala-devel vala-tools
 %global with_tests 0
 %if 0%{?with_tests}
 BuildRequires:  dbus-test-runner valgrind
@ -91,13 +89,13 @@ cp -dpR libdbusmenu-%{version} libdbusmenu-gtk3-%{version}

 %build
 cd %{name}-gtk3-%{version}
-sed -i -e 's@^#!.*python$@#!/usr/bin/python3@' tools/dbusmenu-bench
+sed -i -e 's@^#!.*python$@#!/usr/bin/python2@' tools/dbusmenu-bench
 autoreconf -vif
 %configure --disable-static --disable-dumper --with-gtk=3
 %make_build

 cd ../%{name}-%{version}
-sed -i -e 's@^#!.*python$@#!/usr/bin/python3@' tools/dbusmenu-bench
+sed -i -e 's@^#!.*python$@#!/usr/bin/python2@' tools/dbusmenu-bench
 autoreconf -vif
 %configure --disable-static --disable-dumper --with-gtk=2
 %make_build
@ -199,24 +197,6 @@ cd -
 %{_datadir}/gtk-doc/*

 %changelog
-* Fri Jan 07 2022 wulei <wulei80@huawei.com> - 16.04.0-13
- Repair failed to execute "gtkdocize"
-
-* Mon Oct 26 2020 leiju <leiju4@huawei.com> -  16.04.0-12
- Modify BuildRequires from python2 to python3
-
-* Tue Sep 8 2020 liuweibo <liuweibo10@huawei.com> - 16.04.0-11
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Fix Source0
-
-* Tue Jan 14 2020 openEuler Buildteam <buildteam@openeuler.org> - 16.04.0-10
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:add patch to modify build err
-
 * Sat Dec 21 2019 wangyiru <wangyiru1@huawei.com> -  16.04.0-9
 - Package init

--- a/libdbusmenu.yaml
+++ b/libdbusmenu.yaml
@ -1,4 +0,0 @@
-version_control: NA
-src_repo: NA
-tag_pattern: NA
-seperator: NA