diff --git a/python-libmount.spec b/python-libmount.spec index e6278cd..6bb3819 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -168,6 +168,7 @@ Patch14: util-linux-slash-in-format-string.patch ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff +Patch57: util-linux-slash-in-format-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -369,7 +370,6 @@ SMP systems. %if %build_util_linux %package -n python-libmount Summary: %summary_pl -License: GPL-2.0+ Group: %group_pl %description -n python-libmount @@ -396,6 +396,7 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 +%patch57 -p1 popd %build @@ -624,8 +625,7 @@ make %{?_smp_mflags} check || result="1" # always show test diffs (inclusive known_fail) and exit result diffs_files="$(find tests/diff -type f | sort)" echo "$diffs_files" | xargs -r cat -exit 0 -#exit "$result" +exit "$result" %install %if %build_util_linux diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 5327133..665f441 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -168,6 +168,7 @@ Patch14: util-linux-slash-in-format-string.patch ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff +Patch57: util-linux-slash-in-format-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -395,6 +396,7 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 +%patch57 -p1 popd %build @@ -623,8 +625,7 @@ make %{?_smp_mflags} check || result="1" # always show test diffs (inclusive known_fail) and exit result diffs_files="$(find tests/diff -type f | sort)" echo "$diffs_files" | xargs -r cat -exit 0 -#exit "$result" +exit "$result" %install %if %build_util_linux diff --git a/util-linux.spec b/util-linux.spec index 0532162..f2c47a5 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -168,6 +168,7 @@ Patch14: util-linux-slash-in-format-string.patch ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff +Patch57: util-linux-slash-in-format-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -395,6 +396,7 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 +%patch57 -p1 popd %build @@ -623,8 +625,7 @@ make %{?_smp_mflags} check || result="1" # always show test diffs (inclusive known_fail) and exit result diffs_files="$(find tests/diff -type f | sort)" echo "$diffs_files" | xargs -r cat -exit 0 -#exit "$result" +exit "$result" %install %if %build_util_linux