# TODO
# - vgscan --ignorelocking failure creates /var/lock/lvm (even if /var is not yet mounted)
-# - spec default value for --with-replicators (=internal/shared/none, configure default is none)?
-# (also internal vs shared for lvm1,pool,cluster,snapshots,mirrors,raid,replicators,thin,cache;
-# note: dmeventd requires mirrors=internal)
+# - internal vs shared for snapshots,mirrors,thin,cache ?
+# note: dmeventd requires mirrors=internal)
#
# Conditional build:
# - functionality
-%bcond_without cluster # disable all cluster support (cmirrord)
+%bcond_without cluster # disable all cluster support (cmirrord, dlm support in lvmlockd)
%bcond_without lvmdbusd # lvmdbusd
%bcond_without lvmpolld # lvmpolld (and lvmlockd)
%bcond_without lvmlockd # lvmlockd
%bcond_with sanlock # sanlock support in lvmlockd
-%bcond_with replicator # internal replicator support
# - additional features
%bcond_without selinux # SELinux support
# - bindings
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.00
-Release: 1.1
+Version: 2.03.19
+Release: 1
License: GPL v2 and LGPL v2.1
Group: Applications/System
-Source0: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5: f63cc5feaadd3000138e73f7143ed370
+Source0: ftp://sourceware.org/pub/lvm2/LVM2.%{version}.tgz
+# Source0-md5: e805199669c5fb2d87fba9a4082ecada
Patch0: %{name}-selinux.patch
Patch1: device-mapper-dmsetup-export.patch
Patch2: %{name}-tld_init.patch
-Patch3: dl-dlsym.patch
-Patch4: %{name}-run-dir.patch
-Patch5: device-mapper-dmsetup-deps-export.patch
-Patch6: %{name}-thin.patch
-Patch7: %{name}-no-systemd.patch
-Patch8: %{name}-removed-lvmetad-fix.patch
+Patch3: %{name}-run-dir.patch
+Patch4: device-mapper-dmsetup-deps-export.patch
+Patch5: %{name}-thin.patch
+Patch6: link.patch
URL: http://www.sourceware.org/lvm2/
BuildRequires: autoconf >= 2.69
+BuildRequires: autoconf-archive
BuildRequires: automake
# for /run detection
BuildRequires: filesystem >= 3.0-43
+BuildRequires: libaio-devel
BuildRequires: libblkid-devel >= 2.24
%{?with_selinux:BuildRequires: libselinux-devel >= 1.10}
%{?with_selinux:BuildRequires: libsepol-devel}
# changing CFLAGS in the middle confuses confcache
%undefine configure_cache
-# borken on AC
-%define filterout_ld -Wl,--as-needed
-
# causes: undefined reference to `__stack_chk_fail_local'
%define filterout_c -fstack-protector
-%define skip_post_check_so '.*(libdevmapper-event.so|libdevmapper-event-lvm2.so).*'
+%define skip_post_check_so '.*libdevmapper-event-lvm2.so.*' 'liblvm2cmd.so.*'
%description
This package includes a number of utilities for creating, checking,
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
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-
-# do not force --export-symbol linker option for e.g. statically linked executables
-# -rdynamic compiler option drives linker in the right way.
-%{__sed} -i -e 's#-Wl,--export-dynamic#-rdynamic#g' configure.ac
%build
-cp -f /usr/share/automake/config.sub autoconf
%{__aclocal}
%{__autoconf}
--enable-applib \
--enable-cache_check_needs_check \
--enable-cmdlib \
+%if %{with cluster}
+ --enable-cmirrord \
+%endif
%{?with_lvmdbusd:--enable-dbus-service} \
%{?debug:--enable-debug} \
--enable-dmeventd \
+ --enable-dmfilemapd \
--enable-fsadm \
- --with-default-locking-dir=/var/lock/lvm \
%if %{with lvmlockd}
%{?with_cluster:--enable-lvmlockd-dlm} \
%{?with_sanlock:--enable-lvmlockd-sanlock} \
--enable-ocf \
%{?with_python2:--enable-python2_bindings} \
%{?with_python3:--enable-python3_bindings} \
+ --enable-pkgconfig \
--enable-readline \
%{!?with_selinux:--disable-selinux} \
- --enable-pkgconfig \
+ --disable-silent-rules \
--enable-thin_check_needs_check \
--enable-udev_sync \
--enable-udev_rules \
--with-cache-dump=/usr/sbin/cache_dump \
--with-cache-repair=/usr/sbin/cache_repair \
--with-cache-restore=/usr/sbin/cache_restore \
- --with-cluster=internal \
-%if %{with cluster}
- --enable-cmirrord \
-%endif
+ --with-default-locking-dir=/var/lock/lvm \
--with-dmeventd-path=%{_sbindir}/dmeventd \
--with-interface=ioctl \
- --with-lvm1=internal \
+ --with-libexecdir=%{_libexecdir} \
--with-mirrors=internal \
--with-optimisation="%{rpmcflags}" \
- --with-pool=internal \
- %{?with_replicator:--with-replicators=internal} \
--with-snapshots=internal \
--with-thin=internal \
--with-thin-check=/usr/sbin/thin_check \
--with-udev-prefix=/ \
--with-usrlibdir=%{_libdir}
# use bash because of "set -o pipefail"
+# V=1 still used because of missing --disable-silent-rules support in libdm (as of 2.03.09)
%{__make} -j1 \
- SHELL=/bin/bash
+ SHELL=/bin/bash \
+ V=1
%{__make} -j1 -C libdm \
- LIB_STATIC=libdevmapper.a
+ LIB_STATIC=libdevmapper.a \
+ V=1
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/lvm,/etc/sysconfig}
+install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/lvm,/etc/sysconfig,/var/lock/lvm/subsys}
%{__make} install install_system_dirs install_initscripts \
DESTDIR=$RPM_BUILD_ROOT \
GROUP="" \
python3dir=%{py3_sitescriptdir}
+%{__make} -C scripts \
+ DESTDIR=$RPM_BUILD_ROOT
+
%{__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")
%attr(755,root,root) %{_sbindir}/lvdisplay
%attr(755,root,root) %{_sbindir}/lvextend
%attr(755,root,root) %{_sbindir}/lvm
+%attr(755,root,root) %{_sbindir}/lvm_import_vdo
%attr(755,root,root) %{_sbindir}/lvmconfig
+%attr(755,root,root) %{_sbindir}/lvmdevices
%attr(755,root,root) %{_sbindir}/lvmdiskscan
%attr(755,root,root) %{_sbindir}/lvmdump
%attr(755,root,root) %{_sbindir}/lvmsadc
%attr(755,root,root) %{_sbindir}/vgextend
%attr(755,root,root) %{_sbindir}/vgimport
%attr(755,root,root) %{_sbindir}/vgimportclone
+%attr(755,root,root) %{_sbindir}/vgimportdevices
%attr(755,root,root) %{_sbindir}/vgmerge
%attr(755,root,root) %{_sbindir}/vgmknodes
%attr(755,root,root) %{_sbindir}/vgreduce
%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*
%{_mandir}/man7/lvmraid.7*
%{_mandir}/man7/lvmreport.7*
%{_mandir}/man7/lvmsystemid.7*
%{_mandir}/man7/lvmthin.7*
+%{_mandir}/man7/lvmvdo.7*
%{_mandir}/man8/blkdeactivate.8*
%{_mandir}/man8/fsadm.8*
%{_mandir}/man8/lvchange.8*
%{_mandir}/man8/lvm-fullreport.8*
%{_mandir}/man8/lvm-lvpoll.8*
%{_mandir}/man8/lvm.8*
+%{_mandir}/man8/lvm_import_vdo.8*
%{_mandir}/man8/lvmconfig.8*
+%{_mandir}/man8/lvmdevices.8*
%{_mandir}/man8/lvmdiskscan.8*
%{_mandir}/man8/lvmdump.8*
%{_mandir}/man8/lvmsadc.8*
%{_mandir}/man8/vgextend.8*
%{_mandir}/man8/vgimport.8*
%{_mandir}/man8/vgimportclone.8*
+%{_mandir}/man8/vgimportdevices.8*
%{_mandir}/man8/vgmerge.8*
%{_mandir}/man8/vgmknodes.8*
%{_mandir}/man8/vgreduce.8*
%attr(754,root,root) /etc/rc.d/init.d/lvm2-monitor
%attr(700,root,root) %dir /var/run/lvm
%attr(700,root,root) %dir /var/lock/lvm
+%attr(700,root,root) %dir /var/lock/lvm/subsys
%if %{with lvmlockd}
%attr(755,root,root) %{_sbindir}/lvmlockctl
%attr(755,root,root) %{_sbindir}/lvmlockd
/lib/udev/rules.d/10-dm.rules
/lib/udev/rules.d/11-dm-lvm.rules
/lib/udev/rules.d/13-dm-disk.rules
+/lib/udev/rules.d/69-dm-lvm.rules
/lib/udev/rules.d/95-dm-notify.rules
%attr(755,root,root) %{_sbindir}/dmeventd
+%attr(755,root,root) %{_sbindir}/dmfilemapd
%attr(755,root,root) %{_sbindir}/dmsetup
%attr(755,root,root) %{_sbindir}/dmstats
%attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2mirror.so
%attr(755,root,root) %{_libdir}/device-mapper/libdevmapper-event-lvm2snapshot.so
%attr(755,root,root) %{_libdir}/device-mapper/libdevmapper-event-lvm2thin.so
%attr(755,root,root) %{_libdir}/device-mapper/libdevmapper-event-lvm2vdo.so
+%{_mandir}/man8/dmfilemapd.8*
%{_mandir}/man8/dmsetup.8*
%{_mandir}/man8/dmstats.8*
%{_mandir}/man8/dmeventd.8*