- updated to 2.03.01, reverted bashizm in configure

diff --git a/bashizm.patch b/bashizm.patch
new file mode 100644 (file)
index 0000000..51870d6
--- /dev/null
+++ b/bashizm.patch
@@ -0,0 +1,62 @@
+diff -ur LVM2.2.03.01.orig/configure LVM2.2.03.01/configure
+--- LVM2.2.03.01.orig/configure        2018-10-31 14:54:24.000000000 +0000
++++ LVM2.2.03.01/configure     2018-12-04 08:44:19.090403000 +0000
+@@ -3067,7 +3067,7 @@
+ fi
+ case "$host_os" in
+       linux*)
+-              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 @@
+               ;;
+       darwin*)
+               CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
+-              CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
++              CLDFLAGS="$CLDFLAGS"
+               ELDFLAGS=
+               CLDWHOLEARCHIVE="-all_load"
+               CLDNOWHOLEARCHIVE=
+@@ -3099,9 +3099,6 @@
+               FSADM=no
+               BLKDEACTIVATE=no
+               ;;
+-      *)
+-              CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
+-              ;;
+ esac
+ 
+ ################################################################################
+diff -ur LVM2.2.03.01.orig/configure.ac LVM2.2.03.01/configure.ac
+--- LVM2.2.03.01.orig/configure.ac     2018-10-31 14:54:24.000000000 +0000
++++ LVM2.2.03.01/configure.ac  2018-12-04 08:44:19.091403000 +0000
+@@ -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 -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 @@
+               ;;
+       darwin*)
+               CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
+-              CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
++              CLDFLAGS="$CLDFLAGS"
+               ELDFLAGS=
+               CLDWHOLEARCHIVE="-all_load"
+               CLDNOWHOLEARCHIVE=
+@@ -62,9 +62,6 @@
+               FSADM=no
+               BLKDEACTIVATE=no
+               ;;
+-      *)
+-              CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}"
+-              ;;
+ esac
+ 
+ ################################################################################

diff --git a/lvm2-removed-lvmetad-fix.patch b/lvm2-removed-lvmetad-fix.patch
deleted file mode 100644 (file)
index b682bb9..0000000
--- a/lvm2-removed-lvmetad-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urp LVM2.2.03.00.orig/conf/example.conf.in LVM2.2.03.00/conf/example.conf.in
---- LVM2.2.03.00.orig/conf/example.conf.in     2018-10-21 20:55:01.790416609 +0000
-+++ LVM2.2.03.00/conf/example.conf.in  2018-10-21 21:48:01.712416609 +0000
-@@ -1016,7 +1016,7 @@ global {
-       # are checked during pvscan --cache. To filter a device and prevent
-       # scanning from the LVM system entirely, including lvmetad, use
-       # devices/global_filter.
--      use_lvmetad = @DEFAULT_USE_LVMETAD@
-+      use_lvmetad = 0
- 
-       # Configuration option global/lvmetad_update_wait_time.
-       # Number of seconds a command will wait for lvmetad update to finish.

diff --git a/lvm2.spec b/lvm2.spec
index 7a0c3cdf2815c6bbade51aea27ea11bff2643d35..7e4ef85f2a74f22165748af7573709e7178b6160 100644 (file)
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -31,12 +31,12 @@
 Summary:       The new version of Logical Volume Manager for Linux
 Summary(pl.UTF-8):     Nowa wersja Logical Volume Managera dla Linuksa
 Name:          lvm2
 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.00
-Release:       2
+Version:       2.03.01
+Release:       1

 License:       GPL v2 and LGPL v2.1
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
 License:       GPL v2 and LGPL v2.1
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz

-# Source0-md5: f63cc5feaadd3000138e73f7143ed370
+# Source0-md5: 800287d3521388dcc4a601d099b47bcd

 Patch0:                %{name}-selinux.patch
 Patch1:                device-mapper-dmsetup-export.patch
 Patch2:                %{name}-tld_init.patch
 Patch0:                %{name}-selinux.patch
 Patch1:                device-mapper-dmsetup-export.patch
 Patch2:                %{name}-tld_init.patch


@@ -45,7 +45,7 @@ Patch4:               %{name}-run-dir.patch
 Patch5:                device-mapper-dmsetup-deps-export.patch
 Patch6:                %{name}-thin.patch
 Patch7:                %{name}-no-systemd.patch
 Patch5:                device-mapper-dmsetup-deps-export.patch
 Patch6:                %{name}-thin.patch
 Patch7:                %{name}-no-systemd.patch

-Patch8:                %{name}-removed-lvmetad-fix.patch
+Patch8:                bashizm.patch

 URL:           http://www.sourceware.org/lvm2/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake
 URL:           http://www.sourceware.org/lvm2/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake