- fix conditional

[packages/lvm2.git] / lvm2.spec

diff --git a/lvm2.spec b/lvm2.spec
index 24aeb4980f47e6bdd13d428de848cec4c892b1a3..9eb78160ce8b5e00cccd80b76564e408c1db82fc 100644 (file)
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -17,7 +17,7 @@
 
 # lvmlockd requires lvmpolld
 %if %{without lvmpolld}
-%undefine      with_lvmpolld
+%undefine      with_lvmlockd
 %endif
 
 %if %{without cluster} && %{without sanlock}
@@ -27,18 +27,19 @@
 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.03.15
-Release:       3
+Version:       2.03.23
+Release:       1
 License:       GPL v2 and LGPL v2.1
 Group:         Applications/System
 Source0:       ftp://sourceware.org/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5: 0dbe745e945461419b56c7a21d7e47e2
+# Source0-md5: 0535b5e638b6f0b48f7b259e0ec0ba65
 Patch0:                device-mapper-dmsetup-export.patch
 Patch1:                %{name}-pld_init.patch
 Patch2:                device-mapper-dmsetup-deps-export.patch
 Patch3:                %{name}-thin.patch
 URL:           http://www.sourceware.org/lvm2/
 BuildRequires: autoconf >= 2.69
+BuildRequires: autoconf-archive
 BuildRequires: automake
 # for /run detection
 BuildRequires: filesystem >= 3.0-43
@@ -65,7 +66,7 @@ BuildRequires:        glibc-static
 BuildRequires: libaio-static
 %{?with_selinux:BuildRequires: pcre-static}
 %else
-Obsoletes:     lvm2-initrd
+Obsoletes:     lvm2-initrd < %{version}-%{release}
 %endif
 %if %{with cluster}
 # for cmirrord
@@ -81,9 +82,9 @@ Requires:     systemd-units >= 38
 # doesn't work with 2.4 kernels
 Requires:      uname(release) >= 2.6
 Suggests:      thin-provisioning-tools >= 0.7.0
-Obsoletes:     lvm
+Obsoletes:     lvm < 2
 Obsoletes:     lvm2-clvmd < 2.03
-Obsoletes:     lvm2-systemd
+Obsoletes:     lvm2-systemd < 2.02.94
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sbindir        /sbin
@@ -136,7 +137,7 @@ 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.
 
-%description cmirrord
+%description cmirrord -l pl.UTF-8
 cmirrord to demon śledzący informacje logu lustrzanego w klastrze.
 Jest specyficzny dla klastrów lustrzanych opartych na device-mapperze
 (oraz, poprzez rozszerzenie, klastrów lustrzanych LVM). W klastrach
@@ -268,7 +269,7 @@ Statyczna biblioteka devmapper.
 Summary:       Userspace support for the device-mapper - initrd version
 Summary(pl.UTF-8):     Wsparcie dla mapowania urządzeń w przestrzeni użytkownika - wersja dla initrd
 Group:         Base
-Obsoletes:     device-mapper-initrd-devel
+Obsoletes:     device-mapper-initrd-devel < 2
 Conflicts:     geninitrd < 10000.10
 
 %description -n device-mapper-initrd
@@ -353,6 +354,9 @@ unset CC
 %configure \
        --enable-cache_check_needs_check \
        --enable-cmdlib \
+%if %{with cluster}
+       --enable-cmirrord \
+%endif
        %{?with_lvmdbusd:--enable-dbus-service --enable-notify-dbus} \
        %{?debug:--enable-debug} \
        --enable-dmeventd \
@@ -376,12 +380,10 @@ unset CC
        --with-cache-dump=/usr/sbin/cache_dump \
        --with-cache-repair=/usr/sbin/cache_repair \
        --with-cache-restore=/usr/sbin/cache_restore \
-%if %{with cluster}
-       --enable-cmirrord \
-%endif
        --with-default-locking-dir=/var/lock/lvm \
        --with-dmeventd-path=%{_sbindir}/dmeventd \
        --with-interface=ioctl \
+       --with-libexecdir=%{_libexecdir} \
        --with-mirrors=internal \
        --with-optimisation="%{rpmcflags}" \
        --with-snapshots=internal \
@@ -393,9 +395,9 @@ unset CC
        --with-thin-repair=/usr/sbin/thin_repair \
        --with-thin-restore=/usr/sbin/thin_restore \
        --with-udev-prefix=/ \
+       --with-usrlibdir=%{_libdir} \
        --with-vdo=internal --with-vdo-format=%{_bindir}/vdoformat \
-       --with-writecache=internal \
-       --with-usrlibdir=%{_libdir}
+       --with-writecache=internal
 
 # no --enable-nls: no translations exist, broken
 
@@ -554,6 +556,7 @@ fi
 %attr(755,root,root) %{_sbindir}/vgs
 %attr(755,root,root) %{_sbindir}/vgscan
 %attr(755,root,root) %{_sbindir}/vgsplit
+%attr(755,root,root) %{_libexecdir}/lvresize_fs_helper
 %{_mandir}/man5/lvm.conf.5*
 %{_mandir}/man7/lvmautoactivation.7*
 %{_mandir}/man7/lvmcache.7*