From 26b0e230eaaa2b68b9ddcc50d823d621012437a3 Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Apr 29 2014 08:10:34 +0000 Subject: Remove obsolete lvm2-sysvinit subpackage. As per Fedora packaging guidelines: https://fedoraproject.org/wiki/Packaging:SysVInitScript#Initscripts_in_addition_to_systemd_unit_files --- diff --git a/lvm2.spec b/lvm2.spec index 5389331..bf56282 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -39,7 +39,7 @@ Summary: Userland logical volume management tools Name: lvm2 Version: 2.02.106 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Base URL: http://sources.redhat.com/lvm2 @@ -139,6 +139,14 @@ rm -f $RPM_BUILD_ROOT/%{_unitdir}/lvm2-cmirrord.service %endif %endif +# also, once we migrate the clvmd/cmirrord initscripts to systemd units, +# remove the "make install_initscripts" and these extra removal lines below +rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/blk-availability +rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/lvm2-monitor +%if %{enable_lvmetad} +rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/lvm2-lvmetad +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -457,27 +465,6 @@ fi %endif ############################################################################## -# Legacy SysV init subpackage -############################################################################## -%package sysvinit -Summary: SysV style init script for LVM2. -Group: System Environment/Base -Requires: %{name} = %{version}-%{release} -Requires: initscripts - -%description sysvinit -SysV style init script for LVM2. It needs to be installed only if systemd -is not used as the system init process. - -%files sysvinit -%defattr(555,root,root,-) -%{_sysconfdir}/rc.d/init.d/blk-availability -%{_sysconfdir}/rc.d/init.d/lvm2-monitor -%if %{enable_lvmetad} -%{_sysconfdir}/rc.d/init.d/lvm2-lvmetad -%endif - -############################################################################## # Device-mapper subpackages ############################################################################## %package -n device-mapper @@ -617,6 +604,9 @@ the device-mapper event library. %{_libdir}/pkgconfig/devmapper-event.pc %changelog +* Tue Apr 29 2014 Peter Rajnoha - 2.02.106-3 +- Remove obsolete lvm2-sysvinit subpackage. + * Thu Apr 24 2014 Peter Rajnoha - 2.02.106-2 - Require exact lvm2/device-mapper version among LVM2 subpackages so all of them are always updated synchronously within one update.