- fix run dir breakage introduced by PLD merge

diff --git a/lvm2-lvm_path.patch b/lvm2-lvm_path.patch
deleted file mode 100644 (file)
index 4edf715..0000000
--- a/lvm2-lvm_path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dur -x '*~' LVM2.2.02.95.orig/configure.in LVM2.2.02.95/configure.in
---- LVM2.2.02.95.orig/configure.in     2012-07-01 15:33:45.000000000 +0200
-+++ LVM2.2.02.95/configure.in  2012-07-02 18:41:07.560481138 +0200
-@@ -1267,7 +1267,7 @@
- lvm_exec_prefix=$exec_prefix
- test "$lvm_exec_prefix" = NONE && lvm_exec_prefix=$prefix
- test "$lvm_exec_prefix" = NONE && lvm_exec_prefix=$ac_default_prefix
--LVM_PATH="$lvm_exec_prefix/sbin/lvm"
-+LVM_PATH="$sbindir/lvm"
- AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.])
- 
- if  test "$CLVMD" != none; then

diff --git a/lvm2-run-dir.patch b/lvm2-run-dir.patch
index 516c5aff345cfa1fdbe405dda22a0901142fb42f..f165f21fc548bac7e4a71a1106173cdfa10727e9 100644 (file)
--- a/lvm2-run-dir.patch
+++ b/lvm2-run-dir.patch
@@ -1,7 +1,7 @@
-diff -urp LVM2.2.02.177.orig/configure.in LVM2.2.02.177/configure.in
---- LVM2.2.02.177.orig/configure.in    2017-12-18 20:44:34.000000000 +0000
-+++ LVM2.2.02.177/configure.in 2018-01-26 16:41:52.154221979 +0000
-@@ -706,8 +706,7 @@ pkg_config_init() {
+diff -ur LVM2.2.02.179.orig/configure.ac LVM2.2.02.179/configure.ac
+--- LVM2.2.02.179.orig/configure.ac    2018-06-18 05:24:22.000000000 +0000
++++ LVM2.2.02.179/configure.ac 2018-07-11 15:49:58.540700530 +0000
+@@ -643,8 +643,7 @@
  
  ################################################################################
  AC_MSG_CHECKING(for default run directory)

diff --git a/lvm2.spec b/lvm2.spec
index d39d289d38fd36b2892335bd7e2856be9eb6157f..f58dd5cd15cb6fbcb3bdfe8032fc42afaf561787 100644 (file)
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -55,7 +55,7 @@ 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.02.179
-Release:       1
+Release:       2
 License:       GPL v2 and LGPL v2.1
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
@@ -66,9 +66,10 @@ Patch1:              %{name}-diet.patch
 Patch2:                device-mapper-dmsetup-export.patch
 Patch3:                %{name}-tld_init.patch
 Patch4:                dl-dlsym.patch
-Patch8:                %{name}-clvmd_cmd_timeout.patch
-Patch9:                device-mapper-dmsetup-deps-export.patch
-Patch11:       %{name}-thin.patch
+Patch5:                %{name}-run-dir.patch
+Patch6:                %{name}-clvmd_cmd_timeout.patch
+Patch7:                device-mapper-dmsetup-deps-export.patch
+Patch8:                %{name}-thin.patch
 URL:           http://www.sourceware.org/lvm2/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake
@@ -380,10 +381,10 @@ potrzeby initrd.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch11 -p1
 
 # do not force --export-symbol linker option for e.g. statically linked executables
 # -rdynamic compiler option drives linker in the right way.
@@ -696,7 +697,7 @@ fi
 %ghost %{_sysconfdir}/lvm/cache/.cache
 %attr(754,root,root) /etc/rc.d/init.d/blk-availability
 %attr(754,root,root) /etc/rc.d/init.d/lvm2-monitor
-%attr(700,root,root) %dir /run/lvm
+%attr(700,root,root) %dir /var/run/lvm
 %attr(700,root,root) %dir /var/lock/lvm
 %if %{with lvmetad}
 %attr(755,root,root) %{_sbindir}/lvmetad