packages: lvm2/lvm2.spec, lvm2/lvm2-tmpfiles.conf (NEW) - add systemd support

[cactus]

Author: cactus                       Date: Wed Jan 25 15:03:46 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add systemd support

---- Files affected:
packages/lvm2:
   lvm2.spec (1.182 -> 1.183) , lvm2-tmpfiles.conf (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/lvm2/lvm2.spec
diff -u packages/lvm2/lvm2.spec:1.182 packages/lvm2/lvm2.spec:1.183
--- packages/lvm2/lvm2.spec:1.182	Thu Jan 19 19:35:03 2012
+++ packages/lvm2/lvm2.spec	Wed Jan 25 16:03:41 2012
@@ -41,13 +41,14 @@
 Summary(pl.UTF-8):	Nowa wersja Logical Volume Managera dla Linuksa
 Name:		lvm2
 Version:	2.02.88
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/System
 Source0:	ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
 # Source0-md5:	321429cd1b1526a29cf6d75018b1e4bb
 Source1:	%{name}-initramfs-hook
 Source2:	%{name}-initramfs-local-top
+Source3:	%{name}-tmpfiles.conf
 Patch0:		%{name}-selinux.patch
 Patch1:		%{name}-diet.patch
 Patch2:		device-mapper-dmsetup-export.patch
@@ -62,7 +63,7 @@
 BuildRequires:	ncurses-devel
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel
-BuildRequires:	rpmbuild(macros) >= 1.213
+BuildRequires:	rpmbuild(macros) >= 1.628
 BuildRequires:	udev-devel >= 143
 %if %{with initrd}
 %if %{with dietlibc}
@@ -210,6 +211,14 @@
 Obsoletes:	device-mapper-initrd-devel
 Conflicts:	geninitrd < 10000.10
 
+%package systemd
+Summary:	systemd unit for lvm2
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description systemd
+systemd unit for lvm2.
+
 %description -n device-mapper-initrd
 The goal of this driver is to support volume management. The driver
 enables the definition of new block devices composed of ranges of
@@ -321,7 +330,8 @@
 	--with-mirrors=internal \
 	--with-interface=ioctl \
 	--with-udev-prefix=/ \
-	%{!?with_selinux:--disable-selinux}
+	--with-systemd_dir=%{systemdunitdir} \
+        %{!?with_selinux:--disable-selinux}
 
 %{__make} -j1
 %{__make} -j1 -C libdm LIB_STATIC=libdevmapper.a
@@ -332,11 +342,14 @@
 	$RPM_BUILD_ROOT%{_datadir}/initramfs-tools/{hooks,scripts/local-top}
 %{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
 
-%{__make} install install_system_dirs install_initscripts \
+%{__make} install install_system_dirs install_systemd_units install_initscripts \
 	DESTDIR=$RPM_BUILD_ROOT \
 	OWNER="" \
 	GROUP=""
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
+install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
+
 mv $RPM_BUILD_ROOT%{_libdir}/lib*.so.* $RPM_BUILD_ROOT/%{_lib}
 for lib in $RPM_BUILD_ROOT/%{_lib}/lib*.so.*; do
 	lib=$(echo $lib | sed -e "s#$RPM_BUILD_ROOT##g")
@@ -375,6 +388,15 @@
 %post   -n device-mapper -p /sbin/ldconfig
 %postun -n device-mapper -p /sbin/ldconfig
 
+%post systemd
+%systemd_post lvm2-monitor.service
+
+%preun systemd
+%systemd_preun lvm2-monitor.service
+
+%postun systemd
+%systemd_reload
+
 %files
 %defattr(644,root,root,755)
 %doc README WHATS_NEW doc/*
@@ -439,6 +461,13 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/initrd/dmsetup
 
+%files systemd
+%defattr(644,root,root,755)
+%{_sysconfdir}/tmpfiles.d/lvm2.conf
+%{systemdunitdir}/dm-event.service
+%{systemdunitdir}/dm-event.socket
+%{systemdunitdir}/lvm2-monitor.service
+
 %files initrd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/initrd/lvm
@@ -455,6 +484,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.183  2012/01/25 15:03:41  cactus
+- add systemd support
+
 Revision 1.182  2012/01/19 18:35:03  qboosh
 - updated udev version
 - added openais bcond (adds corosync,openais managers to clvmd, enables cmirrord)

================================================================
Index: packages/lvm2/lvm2-tmpfiles.conf
diff -u /dev/null packages/lvm2/lvm2-tmpfiles.conf:1.1
--- /dev/null	Wed Jan 25 16:03:47 2012
+++ packages/lvm2/lvm2-tmpfiles.conf	Wed Jan 25 16:03:41 2012
@@ -0,0 +1,2 @@
+D /var/lock/lvm 0700 root root -
+D /var/run/lvm 0700 root root -
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lvm2/lvm2.spec?r1=1.182&r2=1.183&f=u