rpm/coreutils
SHA256
1
0
Fork 0
forked from pool/coreutils
Code Pull Requests Activity

Accepting request 849981 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/849981
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=137
This commit is contained in:
Dominique Leuenberger 2020-11-26 22:09:23 +00:00 committed by Git OBS Bridge
commit 843ad1f3ba
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
coreutils.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 16 07:26:20 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 31 07:14:12 UTC 2020 - Bernhard Voelker <mail@bernhard-voelker.de> Mon Aug 31 07:14:12 UTC 2020 - Bernhard Voelker <mail@bernhard-voelker.de>

7
coreutils.spec
View File

@ -68,6 +68,9 @@ BuildRequires: valgrind
%if "%{name}" == "coreutils" || "%{name}" == "coreutils-single" %if "%{name}" == "coreutils" || "%{name}" == "coreutils-single"
Provides: fileutils = %{version} Provides: fileutils = %{version}
Provides: mktemp = %{version} Provides: mktemp = %{version}
%if 0%{?usrmerged}
Provides: /bin/mktemp
%endif
Provides: sh-utils = %{version} Provides: sh-utils = %{version}
Provides: stat = %{version} Provides: stat = %{version}
Provides: textutils = %{version} Provides: textutils = %{version}
@ -251,6 +254,7 @@ ln -v lib/parse-datetime.{c,y} .
make install DESTDIR="%buildroot" pkglibexecdir=%{_libdir}/%{name} make install DESTDIR="%buildroot" pkglibexecdir=%{_libdir}/%{name}
#UsrMerge #UsrMerge
%if !0%{?usrmerged}
install -d %{buildroot}/bin install -d %{buildroot}/bin
for i in arch basename cat chgrp chmod chown cp date dd df echo \ for i in arch basename cat chgrp chmod chown cp date dd df echo \
false ln ls mkdir mknod mktemp mv pwd rm rmdir sleep sort stat \ false ln ls mkdir mknod mktemp mv pwd rm rmdir sleep sort stat \
@ -258,6 +262,7 @@ for i in arch basename cat chgrp chmod chown cp date dd df echo \
do do
ln -sf %{_bindir}/$i %{buildroot}/bin/$i ln -sf %{_bindir}/$i %{buildroot}/bin/$i
done done
%endif
#EndUsrMerge #EndUsrMerge
echo '.so man1/test.1' > %{buildroot}/%{_mandir}/man1/\[.1 echo '.so man1/test.1' > %{buildroot}/%{_mandir}/man1/\[.1
%if "%{name}" == "coreutils" %if "%{name}" == "coreutils"
@ -294,7 +299,9 @@ rm -rf %{buildroot}%{_datadir}/locale
%doc NEWS README THANKS %doc NEWS README THANKS
%{_bindir}/* %{_bindir}/*
#UsrMerge #UsrMerge
%if !0%{?usrmerged}
/bin/* /bin/*
%endif
#EndUsrMerge #EndUsrMerge
%{_libdir}/%{name} %{_libdir}/%{name}