Upgrade to version 2022.1

(cherry picked from commit e34bc8fc3b407382978e3be0f05e9229df0d2f69)

Fix-incorrect-usage-of-the-fail_unless-macro.patch

@@ -1,36 +0,0 @@
-From 4f3f747cdf3e5d7ab0dadc4f25bca56fb16ce923 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hr=C3=A1zk=C3=BD?= <lhrazky@redhat.com>
-Date: Thu, 6 Aug 2020 10:59:59 +0200
-Subject: [PATCH] tests: Fix incorrect usage of the fail_unless macro
-
----
-libdnf/tests/hawkey/test_query.cpp | 2 +-
-libdnf/tests/hawkey/test_sack.cpp  | 2 +-
-2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libdnf/tests/hawkey/test_query.cpp b/libdnf/tests/hawkey/test_query.cpp
-index bf9626a..4235681 100644
---- a/libdnf/tests/hawkey/test_query.cpp
-+++ b/libdnf/tests/hawkey/test_query.cpp
-@@ -303,7 +303,7 @@ START_TEST(test_query_pkg)
-     hy_query_filter(q, HY_PKG_NAME, HY_EQ, "jay");
-     pset = hy_query_run_set(q);
-     hy_query_free(q);
--    fail_unless(dnf_packageset_count(pset), 2);
-+    fail_unless(dnf_packageset_count(pset) == 2);
- 
-     // use hy_query_filter_package_in():
-     q = hy_query_create(test_globals.sack);
-diff --git a/libdnf/tests/hawkey/test_sack.cpp b/libdnf/tests/hawkey/test_sack.cpp
-index 2bb67f4..e5ed31b 100644
---- a/libdnf/tests/hawkey/test_sack.cpp
-+++ b/libdnf/tests/hawkey/test_sack.cpp
-@@ -84,7 +84,7 @@ START_TEST(test_list_arches)
-     const char ** arches = dnf_sack_list_arches(sack);
- 
-     /* noarch, x86_64, athlon, i686, i586, i486, i386 */
--    fail_unless(g_strv_length((gchar**)arches), 7);
-+    fail_unless(g_strv_length((gchar**)arches) == 7);
-     ck_assert_str_eq(arches[3], "i686");
- 
-     g_free(arches);

eliminate-rpmostree-differences.patch

@@ -1,21 +0,0 @@
-diff -Nur rpm-ostree-2018.8_old/Makefile.am rpm-ostree-2018.8/Makefile.am
---- rpm-ostree-2018.8_old/Makefile.am	2019-04-28 15:40:35.032000000 +0800
-+++ rpm-ostree-2018.8/Makefile.am	2019-04-28 15:41:34.856000000 +0800
-@@ -30,7 +30,7 @@
- SUBDIRS += api-doc
- endif
- 
--RPM_OSTREE_GITREV=$(shell if command -v git >/dev/null 2>&1 && test -e $(srcdir)/.git; then git describe --abbrev=42 --tags --always HEAD; fi)
-+RPM_OSTREE_GITREV=$(shell if command -v git >/dev/null 2>&1 && test -e $(srcdir)/.git; then echo 67cf76d85e7783b1f0007638bdad823998340338; fi)
- 
- ACLOCAL_AMFLAGS += -I m4 ${ACLOCAL_FLAGS}
- # WITH_SWDB is a hackaround for it being used in libdnf headers
-diff -Nur rpm-ostree-2018.8_old/rust/Cargo.toml rpm-ostree-2018.8/rust/Cargo.toml
---- rpm-ostree-2018.8_old/rust/Cargo.toml	2019-04-28 15:40:35.112000000 +0800
-+++ rpm-ostree-2018.8/rust/Cargo.toml	2019-04-28 15:41:02.988000000 +0800
-@@ -27,4 +27,4 @@
- 
- [profile.release]
- panic = "abort"
--lto = true
-+lto = false

rpm-ostree.spec

@@ -3,16 +3,13 @@
 %global __provides_exclude_from ^%{_libdir}/%{name}/.*$
 
 Name:		rpm-ostree
-Version:	2018.8
+Version:	2022.1
-Release:	5
+Release:	1
 Summary:	Hybrid image/package system
 License:	LGPLv2+
 URL:		https://github.com/projectatomic/rpm-ostree
 Source0:	https://github.com/coreos/rpm-ostree/archive/v%{version}.tar.xz#/%{name}-%{version}.tar.xz 
 
-Patch0:         eliminate-rpmostree-differences.patch
-Patch1:         Fix-incorrect-usage-of-the-fail_unless-macro.patch
-
 %if %{with rust}
 
 %if !%{defined rust_arches}
@@ -34,7 +31,8 @@ BuildRequires:   gtk-doc gperf gnome-common /usr/bin/g-ir-scanner ostree-devel c
 BuildRequires:   polkit-devel json-glib-devel rpm-devel libarchive-devel systemd-devel 
 BuildRequires:   libcap-devel libcurl-devel librepo-devel expat-devel check-devel 
 BuildRequires:   pkgconfig(libsolv) gcc gcc-c++
-BuildRequires:   chrpath
+BuildRequires:   chrpath json-c-devel libmodulemd-devel sqlite-devel cppunit-devel
+BuildRequires:   glib2-devel gpgme-devel libsolv-tools make python3-devel python3-sphinx swig libsmartcols-devel
 
 Requires:	 ostree bubblewrap fuse 
 
@@ -63,7 +61,6 @@ Header files for rpm-ostree.
 
 %build
 %{?rusttoolset} env NOCONFIGURE=1 ./autogen.sh
-%define _configure %{?rusttoolset} ./configure
 %configure --disable-silent-rules --enable-gtk-doc \
            %{?with_rust:--enable-rust}
 
@@ -81,10 +78,13 @@ echo "%{_libdir}/%{name}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 
 %ldconfig_scriptlets
 
+install -d -m 0755 %{buildroot}/etc/dbus-1/system.d/
+install -pm 0644 src/daemon/org.projectatomic.rpmostree1.conf %{buildroot}/etc/dbus-1/system.d/
+
 %files
 %defattr(-,root,root)
 %doc README.md
-%license COPYING
+%license COPYING.*
 %{_bindir}/*
 %{_sysconfdir}/dbus-1/system.d/*
 %{_sysconfdir}/rpm-ostreed.conf
@@ -95,6 +95,8 @@ echo "%{_libdir}/%{name}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 %{_prefix}/lib/systemd/system/*
 %{_datadir}/dbus-1/system-services
 %{_datadir}/polkit-1/actions/*.policy
+%{_datadir}/dbus-1/system.d/org.projectatomic.rpmostree1.conf
+%{_datadir}/bash-completion/completions/rpm-ostree
 %config(noreplace) /etc/ld.so.conf.d/*
 
 %files       devel
@@ -111,11 +113,8 @@ echo "%{_libdir}/%{name}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 %{_mandir}/man*/*
 
 %changelog
-* Tue Feb 08 2022 xu_ping <xuping33@huawei.com> - 2018.8-5
+* Wed Jan 19 2022 SimpleUpdate Robot <tc@openeuler.org> - 2022.1-1
-- Type:bugfix
+- Upgrade to version 2022.1
-- ID:NA
-- SUG:NA
-- DESC: Fix incorrect usage of the fail_unless macro
 
 * Fri Sep 10 2021 gaihuiying <gaihuiying1@huawei.com> - 2018.8-4
 - Type:bugfix