[packages/lvm2] - updated to 2.02.100 - updated pld_init patch - package resource agents

[qboosh]

commit e55d5c02163cb641bf6e2b73d05bdf17dc0929cd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Sep 13 22:11:22 2013 +0200

    - updated to 2.02.100
    - updated pld_init patch
    - package resource agents

 lvm2-pld_init.patch | 12 ------------
 lvm2.spec           | 34 ++++++++++++++++++++++++++++------
 2 files changed, 28 insertions(+), 18 deletions(-)
---
diff --git a/lvm2.spec b/lvm2.spec
index f3d5cdd..7fd27c0 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,7 +1,6 @@
 # TODO
 # - vgscan --ignorelocking failure creates /var/lock/lvm (even if /var is not yet mounted)
 # - --with-replicators (=internal/shared/none, default is none)?
-# - OCF agents?
 #
 # Conditional build:
 %bcond_without	initrd		# don't build initrd version
@@ -34,12 +33,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.98
-Release:	3
+Version:	2.02.100
+Release:	1
 License:	GPL v2 and LGPL v2.1
 Group:		Applications/System
 Source0:	ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5:	1ce5b7f9981e1d02dfd1d3857c8d9fbe
+# Source0-md5:	9629cf5728544d7e637cafde1f73d777
 Source1:	%{name}-tmpfiles.conf
 Source2:	clvmd.service
 Source3:	clvmd.sysconfig
@@ -62,7 +61,7 @@ BuildRequires:	ncurses-devel
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.647
-BuildRequires:	udev-devel >= 143
+BuildRequires:	udev-devel >= 1:143
 %if %{with initrd}
 %if %{with dietlibc}
 BuildRequires:	dietlibc-static >= 2:0.32-7
@@ -163,6 +162,19 @@ This daemon relies on the cluster infrastructure provided by the
 Cluster MANager (CMAN), which must be set up and running in order for
 cmirrord to function.
 
+%package resource-agents
+Summary:	OCF Resource Agents for LVM2 processes
+Summary(pl.UTF-8):	Agenci OCF do monitorowania procesów LVM2
+Group:		Applications/System
+Requires:	%{name} = %{version}-%{release}
+Requires:	resource-agents
+
+%description resource-agents
+OCF Resource Agents for LVM2 processes.
+
+%description resource-agents -l pl.UTF-8
+Agenci OCF do monitorowania procesów LVM2.
+
 %package -n device-mapper
 Summary:	Userspace support for the device-mapper
 Summary(pl.UTF-8):	Wsparcie dla mapowania urządzeń w przestrzeni użytkownika
@@ -337,6 +349,7 @@ unset CC
 	%{?with_lvmetad:--enable-lvmetad} \
 	--enable-dmeventd \
 	--with-dmeventd-path=%{_sbindir}/dmeventd \
+	--enable-ocf \
 	--enable-pkgconfig \
 	--enable-udev_sync \
 	--enable-udev_rules \
@@ -350,7 +363,9 @@ unset CC
 	--with-snapshots=internal \
 	--with-mirrors=internal \
 	--with-thin=internal \
-	--with-thin-check="" \
+	--with-thin-check=%{_sbindir}/thin_check \
+	--with-thin-dump=%{_sbindir}/thin_dump \
+	--with-thin-repair=%{_sbindir}/thin_repair \
 	--with-interface=ioctl \
 	--with-udev-prefix=/ \
 	--with-systemd_dir=%{systemdunitdir} \
@@ -471,6 +486,8 @@ fi
 %{_mandir}/man8/vg*.8*
 %attr(750,root,root) %dir %{_sysconfdir}/lvm
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/lvm.conf
+%attr(750,root,root) %dir %{_sysconfdir}/lvm/profile
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/profile/default.profile
 %{_sysconfdir}/tmpfiles.d/lvm2.conf
 %{systemdunitdir}/lvm2-monitor.service
 %{systemdunitdir}/blk-availability.service
@@ -496,6 +513,11 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/cmirrord
 %endif
 
+%files resource-agents
+%defattr(644,root,root,755)
+%dir %{_prefix}/lib/ocf/resource.d/lvm2
+%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/lvm2/VolumeGroup
+
 %files -n device-mapper
 %defattr(644,root,root,755)
 %doc *_DM
diff --git a/lvm2-pld_init.patch b/lvm2-pld_init.patch
index 35c0b59..bf1b475 100644
--- a/lvm2-pld_init.patch
+++ b/lvm2-pld_init.patch
@@ -160,18 +160,6 @@ diff -dur LVM2.2.02.98.orig/scripts/lvm2_monitoring_init_red_hat.in LVM2.2.02.98
  	done
  	return $ret
  }
-diff -dur LVM2.2.02.98.orig/scripts/lvm2_monitoring_systemd_red_hat.service.in LVM2.2.02.98/scripts/lvm2_monitoring_systemd_red_hat.service.in
---- LVM2.2.02.98.orig/scripts/lvm2_monitoring_systemd_red_hat.service.in	2012-10-15 16:24:58.000000000 +0200
-+++ LVM2.2.02.98/scripts/lvm2_monitoring_systemd_red_hat.service.in	2012-10-25 11:57:52.000000000 +0200
-@@ -2,7 +2,7 @@
- Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling
- Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8)
- Requires=dm-event.socket
--After=dm-event.socket fedora-storage-init.service fedora-storage-init-late.service lvm2-activation.service lvm2-lvmetad.service
-+After=dm-event.socket pld-storage-init.service pld-storage-init-late.service lvm2-activation.service lvm2-lvmetad.service
- Before=local-fs.target
- DefaultDependencies=no
- Conflicts=shutdown.target
 diff -dur LVM2.2.02.98.orig/scripts/blk_availability_systemd_red_hat.service.in LVM2.2.02.98/scripts/blk_availability_systemd_red_hat.service.in
 --- LVM2.2.02.98.orig/scripts/blk_availability_systemd_red_hat.service.in	2012-10-15 16:24:58.000000000 +0200
 +++ LVM2.2.02.98/scripts/blk_availability_systemd_red_hat.service.in	2012-10-29 15:38:31.000000000 +0100
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lvm2.git/commitdiff/e55d5c02163cb641bf6e2b73d05bdf17dc0929cd