diff --git a/lvm2.spec b/lvm2.spec index 2ce3dfb..a66c2a3 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -2,18 +2,27 @@ %define enable_cluster 1 %if "%{fedora}" == "12" +%define enable_systemd 0 %define enable_udev 0 %define configure_default_data_alignment --with-default-data-alignment=0 %else %if "%{fedora}" == "13" +%define enable_systemd 0 %define enable_udev 1 %define udev_version 153-1 %define configure_default_data_alignment --with-default-data-alignment=0 %else +%if "%{fedora}" == "14" +%define enable_systemd 0 +%define enable_udev 1 +%define udev_version 158-1 +%else +%define enable_systemd 1 %define enable_udev 1 %define udev_version 158-1 %endif %endif +%endif %if %{enable_cluster} %define corosync_version 1.2.0-1 @@ -35,7 +44,9 @@ License: GPLv2 Group: System Environment/Base URL: http://sources.redhat.com/lvm2 Source0: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz +%if %{enable_systemd} Source1: %{name}-tmpfiles.conf +%endif Patch0: lvm2-set-default-preferred_names.patch Patch1: lvm2-uname.patch @@ -53,7 +64,9 @@ BuildRequires: pkgconfig BuildRequires: libudev-devel %endif Requires: %{name}-libs = %{version}-%{release} +%if %{enable_systemd} Requires: initscripts +%endif Requires: module-init-tools Requires(post): chkconfig Requires(preun): chkconfig @@ -91,8 +104,10 @@ make %{?_smp_mflags} make install DESTDIR=$RPM_BUILD_ROOT make install_system_dirs DESTDIR=$RPM_BUILD_ROOT make install_initscripts DESTDIR=$RPM_BUILD_ROOT +%if %{enable_systemd} mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -217,7 +232,9 @@ fi %dir %{_localstatedir}/lock/lvm %dir %{_localstatedir}/run/lvm %{_sysconfdir}/rc.d/init.d/lvm2-monitor +%if %{enable_systemd} %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf +%endif ############################################################################## # Library and Development subpackages @@ -479,6 +496,7 @@ the device-mapper event library. %changelog * Sat Jun 4 2011 Milan Broz - 2.02.84-2 - Accept kernel 3.0 uname string in libdevmapper initialization. +- Make systemd initscripts configurable. * Wed Feb 9 2011 Alasdair Kergon - 2.02.84-1 - Fix big-endian CRC32 checksumming broken since 2.02.75. If affected, @@ -642,6 +660,10 @@ the device-mapper event library. - Add pv_get_property and create generic internal _get_property function. - Make generic GET_*_PROPERTY_FN macros with secondary macro for vg, pv & lv. +* Fri Oct 15 2010 Alasdair Kergon - 2.02.73-3 +- Add --setuuid to dmsetup rename. +- Add dm_task_set_newuuid to set uuid of mapped device post-creation. + * Wed Sep 29 2010 jkeating - 2.02.74-2 - Rebuilt for gcc bug 634757