- more systemd leftovers

diff --git a/lvm2-tmpfiles.conf b/lvm2-tmpfiles.conf
deleted file mode 100644 (file)
index 6e76fcb..0000000
--- a/lvm2-tmpfiles.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-D /var/lock/lvm 0700 root root -
-D /var/run/lvm 0700 root root -

diff --git a/lvm2.spec b/lvm2.spec
index 2565a569915a50b2a9fce5bf20a3e28385a30671..2372520cd10e7a9727fef1ace74669e65348275a 100644 (file)
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -34,13 +34,12 @@ 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.116
 Summary(pl.UTF-8):     Nowa wersja Logical Volume Managera dla Linuksa
 Name:          lvm2
 Version:       2.02.116

-Release:       1
+Release:       2

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

-Source1:       %{name}-tmpfiles.conf
-Source3:       clvmd.sysconfig
+Source1:       clvmd.sysconfig

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


@@ -374,11 +373,8 @@ install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/lvm,/etc/sysconfig}
        OWNER="" \
        GROUP=""
 
        OWNER="" \
        GROUP=""
 

-install -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
-

 %if %{with cluster}
 %if %{with cluster}

-cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/clvmd
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/clvmd

 %endif
 
 mv $RPM_BUILD_ROOT%{_libdir}/lib*.so.* $RPM_BUILD_ROOT/%{_lib}
 %endif
 
 mv $RPM_BUILD_ROOT%{_libdir}/lib*.so.* $RPM_BUILD_ROOT/%{_lib}


@@ -460,7 +456,6 @@ fi
 %if %{with lvmetad}
 /lib/udev/rules.d/69-dm-lvm-metad.rules
 %endif
 %if %{with lvmetad}
 /lib/udev/rules.d/69-dm-lvm-metad.rules
 %endif

-%{_sysconfdir}/tmpfiles.d/lvm2.conf

 %dir %{_sysconfdir}/lvm/cache
 %ghost %{_sysconfdir}/lvm/cache/.cache
 %attr(754,root,root) /etc/rc.d/init.d/blk-availability
 %dir %{_sysconfdir}/lvm/cache
 %ghost %{_sysconfdir}/lvm/cache/.cache
 %attr(754,root,root) /etc/rc.d/init.d/blk-availability