diff --git a/anaconda.spec b/anaconda.spec index 004a5b4..cca4bd6 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -91,6 +91,7 @@ BuildRequires: iscsi-initiator-utils-devel >= %{iscsiver} %ifarch s390 s390x BuildRequires: s390utils-devel %endif +BuildRequires: systemd-units Requires: python-meh >= %{mehver} Requires: policycoreutils @@ -160,6 +161,9 @@ Provides: anaconda-images = %{version}-%{release} Obsoletes: anaconda-runtime < %{version}-%{release} Provides: anaconda-runtime = %{version}-%{release} Obsoletes: booty +Conflicts: udev < 176 +Conflicts: systemd < 38 +Conflicts: filesystem < 3 %description The anaconda package contains the program which was used to install your @@ -167,6 +171,9 @@ system. %prep %setup -q +## FIXME +sed -i 's#ARCHIVE_DEFAULT_BYTES_PER_BLOCK#10240#g' ./loader/unpack.c +sed -i 's#/lib/udev#$(prefix)/lib/udev#g' data/Makefile.* %build %configure --disable-static @@ -205,8 +212,8 @@ update-desktop-database &> /dev/null || : %doc docs/install-methods.txt %doc docs/mediacheck.txt %doc docs/anaconda-release-notes.txt -/lib/systemd/system/* -/lib/udev/rules.d/70-anaconda.rules +%{_unitdir}/* +%{_prefix}/lib/udev/rules.d/70-anaconda.rules %{_bindir}/instperf %{_sbindir}/anaconda %{_sbindir}/logpicker @@ -3521,7 +3528,7 @@ update-desktop-database &> /dev/null || : - Re-get preexisting partitions using their original path. (dlehman) - Don't store a copy of ActionDestroyFormat's device attr. (dlehman) - Don't retry commiting partition table to disk (hdegoede) -- Stop /lib/udev/rules.d/65-md-incremental.rules from messing with mdraid +- Stop %{_prefix}/lib/udev/rules.d/65-md-incremental.rules from messing with mdraid sets (hdegoede) - Don't try to do format handling on drives without media (#523467) (hdegoede)