X-Git-Url: https://git.tld-linux.org/?p=packages%2Flvm2.git;a=blobdiff_plain;f=lvm2.spec;h=15907e89003998f071a48df53d3163f6ebb0c3b2;hp=f3d5cdd8499cf05f8960719982a617bb760673fc;hb=27ad7c289107f954a59f327174f9cfdbb09c5386;hpb=99ada230dd55f3e0aa06824f3b95335424c57557

diff --git a/lvm2.spec b/lvm2.spec
index f3d5cdd..15907e8 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,15 +1,14 @@
 # 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
+%bcond_with	initrd		# don't build initrd version
 %bcond_without	uClibc		# link initrd version with uClibc
 %bcond_with	dietlibc	# link initrd version with dietlibc
 %bcond_with	glibc		# link initrd version with static GLIBC
 %bcond_without  cluster		# disable all cluster support (clvmd&cmirrord)
-%bcond_with	lvmetad		# enable lvmetad
+%bcond_without	lvmetad		# disable lvmetad
 %bcond_without	selinux		# disable SELinux
 
 %ifarch sparc64 sparc
@@ -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.107
+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:	efa5b0ff0245cbccf53aec1f3d8840ba
 Source1:	%{name}-tmpfiles.conf
 Source2:	clvmd.service
 Source3:	clvmd.sysconfig
@@ -48,7 +47,6 @@ Patch1:		%{name}-diet.patch
 Patch2:		device-mapper-dmsetup-export.patch
 Patch3:		%{name}-pld_init.patch
 Patch4:		dl-dlsym.patch
-Patch5:		%{name}-wrapper.patch
 Patch6:		%{name}-lvm_path.patch
 Patch7:		%{name}-sd_notify.patch
 Patch8:		%{name}-clvmd_cmd_timeout.patch
@@ -62,7 +60,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,10 +161,24 @@ 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
 Group:		Base
+Requires(post,postun):	/sbin/ldconfig
 Requires(post,preun,postun):	systemd-units >= 38
 Requires:	systemd-units >= 38
 
@@ -262,7 +274,6 @@ potrzeby initrd.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -289,13 +300,12 @@ cp -f /usr/share/automake/config.sub autoconf
 	ac_cv_lib_dl_dlopen=no \
 	%{?with_uClibc:ac_cv_func_siginterrupt=no} \
 	%{?debug:--enable-debug} \
-	--with-optimisation="%{rpmcflags} -Os" \
+	--disable-nls \
+	--disable-readline \
+	--enable-selinux%{!?with_glibc:=no} \
 	--enable-static_link \
 	--with-lvm1=internal \
-	--disable-selinux \
-	--%{?with_glibc:en}%{!?with_glibc:dis}able-selinux \
-	--disable-readline \
-	--disable-nls
+	--with-optimisation="%{rpmcflags} -Os"
 # glibc version links with normal static libdevicemapper which has selinux enabled
 # and we need to keep these in sync between device-mapper and lvm2
 
@@ -327,34 +337,37 @@ unset CC
 %endif
 
 %configure \
-	--with-usrlibdir=%{_libdir} \
-	%{?debug:--enable-debug} \
-	--with-optimisation="%{rpmcflags}" \
-	--enable-readline \
-	--enable-fsadm \
 	--enable-applib \
 	--enable-cmdlib \
-	%{?with_lvmetad:--enable-lvmetad} \
+	%{?debug:--enable-debug} \
 	--enable-dmeventd \
-	--with-dmeventd-path=%{_sbindir}/dmeventd \
+	--enable-fsadm \
+	%{?with_lvmetad:--enable-lvmetad} \
+	--enable-ocf \
+	--enable-readline \
+	%{!?with_selinux:--disable-selinux} \
 	--enable-pkgconfig \
 	--enable-udev_sync \
 	--enable-udev_rules \
+	--with-cluster=internal \
 %if %{with cluster}
 	--with-clvmd=corosync \
 	--enable-cmirrord \
 %endif
+	--with-dmeventd-path=%{_sbindir}/dmeventd \
+	--with-interface=ioctl \
 	--with-lvm1=internal \
+	--with-mirrors=internal \
+	--with-optimisation="%{rpmcflags}" \
 	--with-pool=internal \
-	--with-cluster=internal \
 	--with-snapshots=internal \
-	--with-mirrors=internal \
+	--with-systemdsystemunitdir=%{systemdunitdir} \
 	--with-thin=internal \
-	--with-thin-check="" \
-	--with-interface=ioctl \
+	--with-thin-check=%{_sbindir}/thin_check \
+	--with-thin-dump=%{_sbindir}/thin_dump \
+	--with-thin-repair=%{_sbindir}/thin_repair \
 	--with-udev-prefix=/ \
-	--with-systemd_dir=%{systemdunitdir} \
-	%{!?with_selinux:--disable-selinux}
+	--with-usrlibdir=%{_libdir}
 
 %{__make} -j1
 %{__make} -j1 -C libdm LIB_STATIC=libdevmapper.a
@@ -370,11 +383,11 @@ install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/lvm,/etc/sysconfig}
 	GROUP=""
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
 
 %if %{with cluster}
-install %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/clvmd.service
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/clvmd
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/clvmd.service
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/clvmd
 %endif
 
 mv $RPM_BUILD_ROOT%{_libdir}/lib*.so.* $RPM_BUILD_ROOT/%{_lib}
@@ -464,6 +477,7 @@ fi
 %attr(755,root,root) %{_sbindir}/pv*
 %attr(755,root,root) %{_sbindir}/vg*
 %{_mandir}/man5/lvm.conf.5*
+%{_mandir}/man7/lvmthin.7*
 %{_mandir}/man8/blkdeactivate.8*
 %{_mandir}/man8/fsadm.8*
 %{_mandir}/man8/lv*.8*
@@ -471,12 +485,28 @@ 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/command_profile_template.profile
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/profile/metadata_profile_template.profile
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/profile/thin-generic.profile
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/profile/thin-performance.profile
+%if %{with lvmetad}
+/lib/udev/rules.d/69-dm-lvm-metad.rules
+%endif
 %{_sysconfdir}/tmpfiles.d/lvm2.conf
-%{systemdunitdir}/lvm2-monitor.service
 %{systemdunitdir}/blk-availability.service
+%if %{with lvmetad}
+%{systemdunitdir}/lvm2-lvmetad.service
+%{systemdunitdir}/lvm2-lvmetad.socket
+%endif
+%{systemdunitdir}/lvm2-monitor.service
+%{systemdunitdir}/lvm2-pvscan@.service
 %dir %{_sysconfdir}/lvm/cache
 %ghost %{_sysconfdir}/lvm/cache/.cache
 %attr(754,root,root) /etc/rc.d/init.d/blk-availability
+%if %{with lvmetad}
+%attr(754,root,root) /etc/rc.d/init.d/lvm2-lvmetad
+%endif
 %attr(754,root,root) /etc/rc.d/init.d/lvm2-monitor
 %dir %attr(700,root,root) /var/run/lvm
 
@@ -486,16 +516,25 @@ fi
 %attr(755,root,root) %{_usrsbindir}/clvmd
 %attr(754,root,root) /etc/rc.d/init.d/clvmd
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/clvmd
+%attr(755,root,root) /lib/systemd/lvm2-cluster-activation
 %{systemdunitdir}/clvmd.service
+%{systemdunitdir}/lvm2-cluster-activation.service
+%{systemdunitdir}/lvm2-clvmd.service
 %{_mandir}/man8/clvmd.8*
 
 %files cmirrord
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_usrsbindir}/cmirrord
-%{_mandir}/man8/cmirrord.8*
 %attr(754,root,root) /etc/rc.d/init.d/cmirrord
+%{systemdunitdir}/lvm2-cmirrord.service
+%{_mandir}/man8/cmirrord.8*
 %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