- updated to 2.03.13

diff --git a/bashizm.patch b/bashizm.patch
deleted file mode 100644 (file)
index 13d75cc..0000000
--- a/bashizm.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-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 -Wl,--version-script,.export.sym"
-               # equivalent to -rdynamic
-               ELDFLAGS="-Wl,--export-dynamic"
-               # FIXME Generate list and use --dynamic-list=.dlopen.sym
-@@ -3098,7 +3098,7 @@
-               ;;
-       darwin*)
-               CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
--              CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
-+              CLDFLAGS="$CLDFLAGS"
-               ELDFLAGS=
-               CLDWHOLEARCHIVE="-all_load"
-               CLDNOWHOLEARCHIVE=
-@@ -3110,9 +3110,6 @@
-               FSADM=no
-               BLKDEACTIVATE=no
-               ;;
--      *)
--              CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
--              ;;
- esac
- 
- ################################################################################
-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 -Wl,--version-script,.export.sym"
-               # equivalent to -rdynamic
-               ELDFLAGS="-Wl,--export-dynamic"
-               # FIXME Generate list and use --dynamic-list=.dlopen.sym
-@@ -51,7 +51,7 @@
-               ;;
-       darwin*)
-               CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
--              CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
-+              CLDFLAGS="$CLDFLAGS"
-               ELDFLAGS=
-               CLDWHOLEARCHIVE="-all_load"
-               CLDNOWHOLEARCHIVE=
-@@ -63,9 +63,6 @@
-               FSADM=no
-               BLKDEACTIVATE=no
-               ;;
--      *)
--              CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
--              ;;
- esac
- 
- ################################################################################

diff --git a/link.patch b/link.patch
index e89d3ae2709447f3b464d8e03ade1801796dd0d3..9702ef0f9ba14f009ef8dc41ae7852ecf9c0cf0c 100644 (file)
--- a/link.patch
+++ b/link.patch
@@ -1,12 +1,12 @@
 diff -ur LVM2.2.03.02.orig/tools/Makefile.in LVM2.2.03.02/tools/Makefile.in
 --- LVM2.2.03.02.orig/tools/Makefile.in        2018-12-18 15:22:34.000000000 +0100
 +++ LVM2.2.03.02/tools/Makefile.in     2019-03-22 21:16:03.771000000 +0100
-@@ -154,7 +154,7 @@
+@@ -158,7 +158,7 @@
        $(Q) $(CC) -shared -Wl,-soname,$@.$(LIB_VERSION) \
                $(CFLAGS) $(CLDFLAGS) -o $@ \
-               @CLDWHOLEARCHIVE@ liblvm2cmd.a @CLDNOWHOLEARCHIVE@ \
--              $(LVMINTERNAL_LIBS) $(LVMLIBS)
-+              $(LVMINTERNAL_LIBS) $(LVMLIBS) -ldevmapper-event
+               @CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@ \
+-              $(INTERNAL_LIBS) $(LVMLIBS)
++              $(INTERNAL_LIBS) $(LVMLIBS) -ldevmapper-event
  
  liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)
        @echo "    [LN] $@"

diff --git a/lvm2.spec b/lvm2.spec
index 883b926f1e6028b8acb935b97806d71a59c2ae7f..7c6693e279ecb5320569820b15822fdfcb4f24d7 100644 (file)
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -28,7 +28,7 @@
 %undefine      with_lvmdbusd
 %endif
 
-%define                ver     2.03.11
+%define                ver     2.03.13
 %define                tgz_ver %(echo %{version} | tr . _)
 
 Summary:       The new version of Logical Volume Manager for Linux
@@ -39,7 +39,7 @@ Release:      1
 License:       GPL v2 and LGPL v2.1
 Group:         Applications/System
 Source0:       https://github.com/lvmteam/lvm2/archive/v%{tgz_ver}.tar.gz
-# Source0-md5: 98b9e5afc0c401e74255387e375f99c1
+# Source0-md5: dbf58a0fc297ea87ff90ba5c825b2286
 Patch0:                %{name}-selinux.patch
 Patch1:                device-mapper-dmsetup-export.patch
 Patch2:                %{name}-tld_init.patch
@@ -47,8 +47,7 @@ Patch3:               %{name}-run-dir.patch
 Patch4:                device-mapper-dmsetup-deps-export.patch
 Patch5:                %{name}-thin.patch
 Patch6:                %{name}-no-systemd.patch
-Patch7:                bashizm.patch
-Patch8:                link.patch
+Patch7:                link.patch
 URL:           http://www.sourceware.org/lvm2/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake
@@ -290,7 +289,6 @@ Statyczna biblioteka devmapper zbudowana z dietlibc.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 # do not force --export-symbol linker option for e.g. statically linked executables
 # -rdynamic compiler option drives linker in the right way.
@@ -421,6 +419,7 @@ fi
 %attr(755,root,root) %{_sbindir}/lvextend
 %attr(755,root,root) %{_sbindir}/lvm
 %attr(755,root,root) %{_sbindir}/lvmconfig
+%attr(755,root,root) %{_sbindir}/lvmdevices
 %attr(755,root,root) %{_sbindir}/lvmdiskscan
 %attr(755,root,root) %{_sbindir}/lvmdump
 %attr(755,root,root) %{_sbindir}/lvmsadc
@@ -440,6 +439,7 @@ fi
 %attr(755,root,root) %{_sbindir}/pvresize
 %attr(755,root,root) %{_sbindir}/pvs
 %attr(755,root,root) %{_sbindir}/pvscan
+%attr(755,root,root) %{_sbindir}/vdoimport
 %attr(755,root,root) %{_sbindir}/vgcfgbackup
 %attr(755,root,root) %{_sbindir}/vgcfgrestore
 %attr(755,root,root) %{_sbindir}/vgchange
@@ -451,6 +451,7 @@ fi
 %attr(755,root,root) %{_sbindir}/vgextend
 %attr(755,root,root) %{_sbindir}/vgimport
 %attr(755,root,root) %{_sbindir}/vgimportclone
+%attr(755,root,root) %{_sbindir}/vgimportdevices
 %attr(755,root,root) %{_sbindir}/vgmerge
 %attr(755,root,root) %{_sbindir}/vgmknodes
 %attr(755,root,root) %{_sbindir}/vgreduce
@@ -479,6 +480,7 @@ fi
 %{_mandir}/man8/lvm-lvpoll.8*
 %{_mandir}/man8/lvm.8*
 %{_mandir}/man8/lvmconfig.8*
+%{_mandir}/man8/lvmdevices.8*
 %{_mandir}/man8/lvmdiskscan.8*
 %{_mandir}/man8/lvmdump.8*
 %{_mandir}/man8/lvmsadc.8*
@@ -498,6 +500,7 @@ fi
 %{_mandir}/man8/pvresize.8*
 %{_mandir}/man8/pvs.8*
 %{_mandir}/man8/pvscan.8*
+%{_mandir}/man8/vdoimport.8*
 %{_mandir}/man8/vgcfgbackup.8*
 %{_mandir}/man8/vgcfgrestore.8*
 %{_mandir}/man8/vgchange.8*
@@ -509,6 +512,7 @@ fi
 %{_mandir}/man8/vgextend.8*
 %{_mandir}/man8/vgimport.8*
 %{_mandir}/man8/vgimportclone.8*
+%{_mandir}/man8/vgimportdevices.8*
 %{_mandir}/man8/vgmerge.8*
 %{_mandir}/man8/vgmknodes.8*
 %{_mandir}/man8/vgreduce.8*