From 755772092fa4abda115cb0fdd417df28d4299350 Mon Sep 17 00:00:00 2001 From: geruijun Date: Wed, 23 Mar 2022 08:52:00 +0000 Subject: [PATCH 1/5] update thin-provisioning-tools.spec. --- thin-provisioning-tools.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/thin-provisioning-tools.spec b/thin-provisioning-tools.spec index a6e4b12..4f1bef9 100644 --- a/thin-provisioning-tools.spec +++ b/thin-provisioning-tools.spec @@ -1,12 +1,13 @@ Name: thin-provisioning-tools Version: 0.9.0 -Release: 3 +Release: 4 Summary: Tools for manipulating Device-mapper metadata License: GPLv3+ URL: https://github.com/jthornber/thin-provisioning-tools Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz Patch1: 0001-device-mapper-persistent-data-avoid-strip.patch Patch2: 0002-build-remove-lboost_iostreams-linker-flag.patch +Patch3: 0003-fix-googletest-version.patch BuildRequires: autoconf, expat-devel BuildRequires: libaio-devel, libstdc++-devel @@ -41,6 +42,11 @@ autoconf %install make DESTDIR=%{buildroot} MANDIR=%{_mandir} install +%check +sh get-gmock.sh +./configure --enable-testing +make unit_test + %files %doc README.md %license COPYING @@ -51,6 +57,9 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %{_mandir}/man*/* %changelog +* Wed Mar 23 2022 Ge Ruijun - 0.9.0-4 +- fix googletest version + * Wed Sep 15 2021 Liu Zixian - 0.9.0-3 - Remove redundant dependency -- Gitee From 0a7b6f332308505612ecfb79ba9eb6e12eac01a1 Mon Sep 17 00:00:00 2001 From: geruijun Date: Wed, 23 Mar 2022 09:00:34 +0000 Subject: [PATCH 2/5] add 0003-fix-googletest-version.patch. --- 0003-fix-googletest-version.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 0003-fix-googletest-version.patch diff --git a/0003-fix-googletest-version.patch b/0003-fix-googletest-version.patch new file mode 100644 index 0000000..4e6354d --- /dev/null +++ b/0003-fix-googletest-version.patch @@ -0,0 +1,21 @@ +From a0fdb1104615684cfb0c4e39319b48237a5447ec Mon Sep 17 00:00:00 2001 +From: geruijun +Date: Wed, 23 Mar 2022 16:01:47 +0800 +Subject: [PATCH] fix googletest version + +Signed-off-by: geruijun +--- + get-gmock.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/get-gmock.sh b/get-gmock.sh +index 2e5d2ae..164ee04 100755 +--- a/get-gmock.sh ++++ b/get-gmock.sh +@@ -1,3 +1,3 @@ + #!/bin/sh -e + +-git clone https://github.com/google/googletest ++git clone https://github.com/google/googletest --branch release-1.10.0 --depth 1 +-- +1.8.3.1 \ No newline at end of file -- Gitee From 03e7448db3563aa1c5844a6db1efe145276a80ab Mon Sep 17 00:00:00 2001 From: geruijun Date: Wed, 23 Mar 2022 09:02:51 +0000 Subject: [PATCH 3/5] update 0003-fix-googletest-version.patch. --- 0003-fix-googletest-version.patch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/0003-fix-googletest-version.patch b/0003-fix-googletest-version.patch index 4e6354d..49410c5 100644 --- a/0003-fix-googletest-version.patch +++ b/0003-fix-googletest-version.patch @@ -16,6 +16,4 @@ index 2e5d2ae..164ee04 100755 #!/bin/sh -e -git clone https://github.com/google/googletest -+git clone https://github.com/google/googletest --branch release-1.10.0 --depth 1 --- -1.8.3.1 \ No newline at end of file ++git clone https://github.com/google/googletest --branch release-1.10.0 --depth 1 \ No newline at end of file -- Gitee From ed8f3b306418db20a9a37778a480db917ce8fd3f Mon Sep 17 00:00:00 2001 From: geruijun Date: Thu, 24 Mar 2022 01:45:01 +0000 Subject: [PATCH 4/5] update thin-provisioning-tools.spec. --- thin-provisioning-tools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/thin-provisioning-tools.spec b/thin-provisioning-tools.spec index 4f1bef9..a0adcdc 100644 --- a/thin-provisioning-tools.spec +++ b/thin-provisioning-tools.spec @@ -12,6 +12,7 @@ Patch3: 0003-fix-googletest-version.patch BuildRequires: autoconf, expat-devel BuildRequires: libaio-devel, libstdc++-devel BuildRequires: boost-devel, gcc-c++ +BuildRequires: perl, perl-libs Requires: expat Recommends: %{name}-help = %{version}-%{release} Provides: device-mapper-persistent-data -- Gitee From d866d27cbddc978e5bb2106d61cb2bda41018459 Mon Sep 17 00:00:00 2001 From: geruijun Date: Fri, 25 Mar 2022 09:09:01 +0000 Subject: [PATCH 5/5] update thin-provisioning-tools.spec. --- thin-provisioning-tools.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/thin-provisioning-tools.spec b/thin-provisioning-tools.spec index a0adcdc..4f1bef9 100644 --- a/thin-provisioning-tools.spec +++ b/thin-provisioning-tools.spec @@ -12,7 +12,6 @@ Patch3: 0003-fix-googletest-version.patch BuildRequires: autoconf, expat-devel BuildRequires: libaio-devel, libstdc++-devel BuildRequires: boost-devel, gcc-c++ -BuildRequires: perl, perl-libs Requires: expat Recommends: %{name}-help = %{version}-%{release} Provides: device-mapper-persistent-data -- Gitee