From 52547c3951058ccc190d649b2787a2b0564dc5e6 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Thu, 12 Dec 2019 15:17:27 +0100
Subject: [PATCH] - updated to 2.03.07

---
 bashizm.patch | 34 +++++++++++++++++-----------------
 lvm2.spec     | 13 ++++++++-----
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/bashizm.patch b/bashizm.patch
index 5bcdad3..13d75cc 100644
--- a/bashizm.patch
+++ b/bashizm.patch
@@ -1,61 +1,61 @@
-diff -ur LVM2.2.03.02.orig/configure LVM2.2.03.02/configure
---- LVM2.2.03.02.orig/configure	2019-03-22 17:12:48.137000000 +0100
-+++ LVM2.2.03.02/configure	2019-03-22 17:13:03.980000000 +0100
-@@ -3067,7 +3067,7 @@
+diff -ur lvm2-2_03_07.orig/configure lvm2-2_03_07/configure
+--- lvm2-2_03_07.orig/configure	2019-11-30 14:45:51.000000000 +0100
++++ lvm2-2_03_07/configure	2019-12-12 15:12:39.649000000 +0100
+@@ -3077,7 +3077,7 @@
  fi
  case "$host_os" in
  	linux*)
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym"
+-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym"
 +		CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
  		# equivalent to -rdynamic
  		ELDFLAGS="-Wl,--export-dynamic"
  		# FIXME Generate list and use --dynamic-list=.dlopen.sym
-@@ -3087,7 +3087,7 @@
+@@ -3098,7 +3098,7 @@
  		;;
  	darwin*)
  		CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
+-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
 +		CLDFLAGS="$CLDFLAGS"
  		ELDFLAGS=
  		CLDWHOLEARCHIVE="-all_load"
  		CLDNOWHOLEARCHIVE=
-@@ -3099,9 +3099,6 @@
+@@ -3110,9 +3110,6 @@
  		FSADM=no
  		BLKDEACTIVATE=no
  		;;
 -	*)
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
+-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
 -		;;
  esac
  
  ################################################################################
-diff -ur LVM2.2.03.02.orig/configure.ac LVM2.2.03.02/configure.ac
---- LVM2.2.03.02.orig/configure.ac	2019-03-22 17:12:48.155000000 +0100
-+++ LVM2.2.03.02/configure.ac	2019-03-22 17:13:03.980000000 +0100
+diff -ur lvm2-2_03_07.orig/configure.ac lvm2-2_03_07/configure.ac
+--- lvm2-2_03_07.orig/configure.ac	2019-11-30 14:45:51.000000000 +0100
++++ lvm2-2_03_07/configure.ac	2019-12-12 15:11:27.591000000 +0100
 @@ -30,7 +30,7 @@
  AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"])
  case "$host_os" in
  	linux*)
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym"
+-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym"
 +		CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
  		# equivalent to -rdynamic
  		ELDFLAGS="-Wl,--export-dynamic"
  		# FIXME Generate list and use --dynamic-list=.dlopen.sym
-@@ -50,7 +50,7 @@
+@@ -51,7 +51,7 @@
  		;;
  	darwin*)
  		CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
+-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
 +		CLDFLAGS="$CLDFLAGS"
  		ELDFLAGS=
  		CLDWHOLEARCHIVE="-all_load"
  		CLDNOWHOLEARCHIVE=
-@@ -62,9 +62,6 @@
+@@ -63,9 +63,6 @@
  		FSADM=no
  		BLKDEACTIVATE=no
  		;;
 -	*)
--		CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
+-		CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
 -		;;
  esac
  
diff --git a/lvm2.spec b/lvm2.spec
index 07368d8..62a5aff 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -28,15 +28,18 @@
 %undefine	with_lvmdbusd
 %endif
 
+%define		ver	2.03.07
+%define		tgz_ver	%(echo %{version} | tr . _)
+
 Summary:	The new version of Logical Volume Manager for Linux
 Summary(pl.UTF-8):	Nowa wersja Logical Volume Managera dla Linuksa
 Name:		lvm2
-Version:	2.03.05
-Release:	2
+Version:	%{ver}
+Release:	1
 License:	GPL v2 and LGPL v2.1
 Group:		Applications/System
-Source0:	ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5:	22e4a9e66b94bbfcf81444472ed32a2d
+Source0:	https://github.com/lvmteam/lvm2/archive/v%{tgz_ver}.tar.gz
+# Source0-md5:	044cb75adf19abd6723fed1ee8bf5776
 Patch0:		%{name}-selinux.patch
 Patch1:		device-mapper-dmsetup-export.patch
 Patch2:		%{name}-tld_init.patch
@@ -278,7 +281,7 @@ Static devmapper library built with dietlibc.
 Statyczna biblioteka devmapper zbudowana z dietlibc.
 
 %prep
-%setup -q -n LVM2.%{version}
+%setup -q -n lvm2-%{tgz_ver}
 %{?with_selinux:%patch0 -p1}
 %patch1 -p1
 %patch2 -p1
-- 
2.46.0