Accepting request 893677 from devel:tools

OBS-URL: https://build.opensuse.org/request/show/893677
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fakeroot?expand=0&rev=10
This commit is contained in:
Dominique Leuenberger 2021-05-17 16:45:14 +00:00 committed by Git OBS Bridge
commit 01fcb5aa82
3 changed files with 21 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun May 16 21:18:43 UTC 2021 - Andreas Schwab <schwab@suse.de>
- stat-ver-riscv.patch: fix _STAT_VER on riscv
- reenable testsuite
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 17 14:56:05 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr> Wed Mar 17 14:56:05 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -32,6 +32,7 @@ Patch2: %{name}-1.21-fix-shell-in-fakeroot
Patch3: fakeroot-drop-tartest.patch Patch3: fakeroot-drop-tartest.patch
# PATCH-FIX-UPSTREAM # PATCH-FIX-UPSTREAM
Patch4: 0001-glibc-2.33-compatibility-fixes.patch Patch4: 0001-glibc-2.33-compatibility-fixes.patch
Patch5: stat-ver-riscv.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: fdupes BuildRequires: fdupes
# user(daemon)/group(sys) is required for t.tar testsuite # user(daemon)/group(sys) is required for t.tar testsuite
@ -44,7 +45,7 @@ BuildRequires: sharutils
BuildRequires: group(sys) BuildRequires: group(sys)
BuildRequires: user(daemon) BuildRequires: user(daemon)
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(preun): update-alternatives Requires(preun):update-alternatives
%description %description
fakeroot runs a command in an environment wherein it appears to have fakeroot runs a command in an environment wherein it appears to have
@ -108,11 +109,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/{faked,fakeroot}{,.1%{ext_man}} touch %{buildroot}%{_sysconfdir}/alternatives/{faked,fakeroot}{,.1%{ext_man}}
%check %check
%if 0%{?suse_version} < 1315
for type in sysv tcp; do for type in sysv tcp; do
%make_build -C obj-$type check %make_build -C obj-$type check
done done
%endif
%post %post
%{_sbindir}/update-alternatives --install %{_bindir}/fakeroot fakeroot %{_bindir}/fakeroot-sysv 20 \ %{_sbindir}/update-alternatives --install %{_bindir}/fakeroot fakeroot %{_bindir}/fakeroot-sysv 20 \

13
stat-ver-riscv.patch Normal file
View File

@ -0,0 +1,13 @@
Index: fakeroot-1.25.3/libfakeroot.c
===================================================================
--- fakeroot-1.25.3.orig/libfakeroot.c
+++ fakeroot-1.25.3/libfakeroot.c
@@ -91,7 +91,7 @@
#endif
#ifndef _STAT_VER
- #if defined (__aarch64__)
+ #if defined (__aarch64__) || defined (__riscv)
#define _STAT_VER 0
#elif defined (__x86_64__)
#define _STAT_VER 1