3
0
forked from pool/util-linux
Marcus Meissner 2014-08-26 14:14:33 +00:00 committed by Git OBS Bridge
parent f4901b361d
commit 962cc353cc
3 changed files with 9 additions and 7 deletions

View File

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

View File

@ -168,6 +168,7 @@ Patch14: util-linux-slash-in-format-string.patch
## ##
Patch55: klogconsole-quiet.patch Patch55: klogconsole-quiet.patch
Patch56: klogconsole.diff Patch56: klogconsole.diff
Patch57: util-linux-slash-in-format-string.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
%if %build_util_linux %if %build_util_linux
@ -395,6 +396,7 @@ cp -p %{S:22} %{S:23} .
pushd ../klogconsole pushd ../klogconsole
%patch55 -p1 %patch55 -p1
%patch56 -p1 %patch56 -p1
%patch57 -p1
popd popd
%build %build
@ -623,8 +625,7 @@ make %{?_smp_mflags} check || result="1"
# always show test diffs (inclusive known_fail) and exit result # always show test diffs (inclusive known_fail) and exit result
diffs_files="$(find tests/diff -type f | sort)" diffs_files="$(find tests/diff -type f | sort)"
echo "$diffs_files" | xargs -r cat echo "$diffs_files" | xargs -r cat
exit 0 exit "$result"
#exit "$result"
%install %install
%if %build_util_linux %if %build_util_linux

View File

@ -168,6 +168,7 @@ Patch14: util-linux-slash-in-format-string.patch
## ##
Patch55: klogconsole-quiet.patch Patch55: klogconsole-quiet.patch
Patch56: klogconsole.diff Patch56: klogconsole.diff
Patch57: util-linux-slash-in-format-string.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
%if %build_util_linux %if %build_util_linux
@ -395,6 +396,7 @@ cp -p %{S:22} %{S:23} .
pushd ../klogconsole pushd ../klogconsole
%patch55 -p1 %patch55 -p1
%patch56 -p1 %patch56 -p1
%patch57 -p1
popd popd
%build %build
@ -623,8 +625,7 @@ make %{?_smp_mflags} check || result="1"
# always show test diffs (inclusive known_fail) and exit result # always show test diffs (inclusive known_fail) and exit result
diffs_files="$(find tests/diff -type f | sort)" diffs_files="$(find tests/diff -type f | sort)"
echo "$diffs_files" | xargs -r cat echo "$diffs_files" | xargs -r cat
exit 0 exit "$result"
#exit "$result"
%install %install
%if %build_util_linux %if %build_util_linux