diff --git a/dracut.changes b/dracut.changes index e086c66..cbbdb9e 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- -Wed Jun 7 07:33:11 UTC 2017 - daniel.molkentin@suse.com +Wed Jun 7 08:21:16 UTC 2017 - daniel.molkentin@suse.com - Ship udev files required by systemd (bsc#1040153) * adds 0521-Ensure-udev-persistent-storage-compat-rules-get-crea.patch +- Bump package version to 044.1 to allow systemd to depend on this change ------------------------------------------------------------------- Thu May 11 09:55:53 UTC 2017 - daniel.molkentin@suse.com diff --git a/dracut.spec b/dracut.spec index ef73d08..fd6786c 100644 --- a/dracut.spec +++ b/dracut.spec @@ -17,15 +17,17 @@ %define dracutlibdir %{_libexecdir}/dracut +%define _pkg_version 044 Name: dracut -Version: 044 +# Need minor increase for reliable conflicts by systemd, use %{_pkg_version} for real version +Version: 044.1 Release: 0 Summary: Initramfs generator using udev License: GPL-2.0+ and LGPL-2.1+ Group: System/Base Url: https://dracut.wiki.kernel.org/ -Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz +Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{_pkg_version}.tar.xz Source1: dracut-rpmlintrc Source3: mkinitrd_setup_dummy Source4: purge-kernels @@ -265,7 +267,7 @@ Provides: %{name}:%{_bindir}/dracut-catimages This package contains tools to assemble the local initrd and host configuration. %prep -%setup -q +%setup -q -n dracut-%{_pkg_version} %patch12 -p1 %patch13 -p1 @@ -439,7 +441,7 @@ make all CFLAGS="%{optflags}" %{?_smp_mflags} %install make DESTDIR=%{buildroot} install %{?_smp_mflags} -echo -e "#!/bin/bash\nDRACUT_VERSION=%{version}-%{release}" > %{buildroot}/%{dracutlibdir}/dracut-version.sh +echo -e "#!/bin/bash\nDRACUT_VERSION=%{_pkg_version}-%{release}" > %{buildroot}/%{dracutlibdir}/dracut-version.sh # use 00systemd-bootchart instead rm -fr %{buildroot}/%{dracutlibdir}/modules.d/00bootchart