!3 Revert version to v1.1.1

Merge pull request !3 from chengquan/master

backport-tests-flowtable-Don-t-check-NFTNL_FLOOWTABLE_SIZE.patch

@@ -1,37 +0,0 @@
-From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001
-From: Phil Sutter <phil@nwl.cc>
-Date: Mon, 2 Dec 2019 18:29:56 +0100
-Subject: [PATCH] tests: flowtable: Don't check NFTNL_FLOWTABLE_SIZE
-
-Marshalling code around that attribute has been dropped by commit
-d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") so it's value is
-lost during the test.
-
-Assuming that NFTNL_FLOWTABLE_SIZE will receive kernel support at a
-later point, leave the test code in place but just comment it out.
-
-Fixes: d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE")
-Signed-off-by: Phil Sutter <phil@nwl.cc>
-Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- tests/nft-flowtable-test.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/nft-flowtable-test.c b/tests/nft-flowtable-test.c
-index 3edb00d..8ab8d4c 100644
---- a/tests/nft-flowtable-test.c
-+++ b/tests/nft-flowtable-test.c
-@@ -33,9 +33,11 @@ static void cmp_nftnl_flowtable(struct nftnl_flowtable *a, struct nftnl_flowtabl
- 	if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_USE) !=
- 	    nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_USE))
- 		print_err("Flowtable use mismatches");
-+#if 0
- 	if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_SIZE) !=
- 	    nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_SIZE))
- 		print_err("Flowtable size mismatches");
-+#endif
- 	if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_FLAGS) !=
- 	    nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_FLAGS))
- 		print_err("Flowtable flags mismatches");
--- 
-2.19.1

libnftnl.spec

@@ -1,14 +1,12 @@
 Name: libnftnl
-Version: 1.1.5
+Version: 1.1.1
-Release: 2
+Release: 6
 Summary: Library for low-level interaction with nftables Netlink's API over libmnl
 License: GPLv2+
 URL: http://netfilter.org/projects/libnftnl/
 Source0: http://ftp.netfilter.org/pub/libnftnl/libnftnl-%{version}.tar.bz2
 
-Patch6000: backport-tests-flowtable-Don-t-check-NFTNL_FLOOWTABLE_SIZE.patch
+BuildRequires: libmnl-devel jansson-devel gcc
-
-BuildRequires: libmnl-devel jansson-devel gcc libnftnl
 
 # replace old libnftables package
 Provides: libnftables = %{version}-%{release}
@@ -20,7 +18,7 @@ to the in-kernel nf_tables subsystem.
 
 %package devel
 Summary: Development files for %{name}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{_isa} = %{version}-%{release}
 # replace old libnftables-devel package
 Provides: libnftables-devel = %{version}-%{release}
 Obsoletes: libnftables-devel < 0-0.6
@@ -30,7 +28,7 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%autosetup -n %{name}-%{version} -p1
+%setup -q
 
 %build
 %configure --disable-static --disable-silent-rules --with-json-parsing
@@ -40,9 +38,6 @@ developing applications that use %{name}.
 %make_install
 %delete_la
 
-# Include previous ABI version for temporary binary compatibility            
-cp -a %{_libdir}/libnftnl.so.7* %{buildroot}%{_libdir}
-
 %check
 make %{?_smp_mflags} check
 
@@ -56,12 +51,6 @@ make %{?_smp_mflags} check
 %{_includedir}/libnftnl
 
 %changelog
-* Tue Apr 28 2020 Yufa Fang<fangyufa1@huawei.com> - 1.1.5-2
-- include previous ABI version for temporary binary compatibility
-
-* Fri Apr 24 2020 Yufa Fang<fangyufa1@huawei.com> - 1.1.5-1
-- update to 1.1.5 and fix flowtable tests failure
-
 * Tue Sep 17 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.1.1-6
 - Package init