X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=coreutils.spec;h=5d37ac64c17b0f9e559a672d7163660da774eaec;hb=d564be8ce1adc5b7cafc85bc0f141df7f24200e9;hp=7a597074e64dec3eda49947ced2e229e4846ece9;hpb=f20c314dddbcee041c49c475aacb0312e501f938;p=packages%2Fcoreutils.git diff --git a/coreutils.spec b/coreutils.spec index 7a59707..5d37ac6 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,17 +1,19 @@ +# # Conditional build: -%bcond_with advcopy # progress bar in cp (orphaned patch) +%bcond_with advcopy # progress bar in cp (orphaned patch) %bcond_with multicall # Compile all the tools in a single binary -%bcond_without tests # do not perform "make test check" +%bcond_with tests # unit tests running +%bcond_without y2038 # Y2038 support for 32-bit archs Summary: GNU Core-utils - basic command line utilities Summary(pl.UTF-8): GNU Core-utils - podstawowe narzędzia działające z linii poleceń Name: coreutils -Version: 8.29 +Version: 9.1 Release: 1 License: GPL v3+ Group: Applications/System Source0: http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz -# Source0-md5: 960cfe75a42c9907c71439f8eb436303 +# Source0-md5: 8b1ca4e018a7dce9bb937faec6618671 Source1: %{name}-non-english-man-pages.tar.bz2 # Source1-md5: f7c986ebc74ccb8d08ed70141063f14c Source2: DIR_COLORS @@ -19,29 +21,32 @@ Source3: DIR_COLORS.256color Source4: colorls.sh Source5: colorls.csh Source6: mktemp.1.pl +Source7: %{name}.sh Patch0: %{name}-info.patch Patch1: %{name}-getgid.patch Patch2: %{name}-uname-cpuinfo.patch Patch3: %{name}-date-man.patch + Patch6: %{name}-fmt-wchars.patch Patch7: %{name}-sparc64.patch # http://translationproject.org/latest/coreutils/pl.po (pass through msgcat to generate shorter diff) Patch8: %{name}-pl.po-update.patch -# from http://www.beatex.org/web/advancedcopy.html, edited by shadzik +# https://github.com/jarun/advcpmv Patch9: %{name}-advcopy.patch Patch10: tests.patch URL: http://www.gnu.org/software/coreutils/ BuildRequires: acl-devel BuildRequires: attr-devel -BuildRequires: autoconf >= 2.64 +BuildRequires: autoconf >= 2.69 BuildRequires: automake >= 1:1.11.2 BuildRequires: gcc >= 5:3.2 -BuildRequires: gettext-tools >= 0.18.1 +BuildRequires: gettext-tools >= 0.19.2 BuildRequires: gmp-devel BuildRequires: help2man BuildRequires: libcap-devel BuildRequires: libselinux-devel BuildRequires: rpmbuild(find_lang) >= 1.24 +BuildRequires: smack-devel BuildRequires: tar >= 1:1.22 BuildRequires: texinfo >= 4.2 BuildRequires: xz @@ -103,11 +108,13 @@ Programy zawarte w tym pakiecie to: %prep %setup -q -a1 -%patch8 -p1 +# translationproject seems to be older than in 9.0 +#%patch8 -p1 %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 + %patch6 -p1 %ifarch sparc64 %patch7 -p1 @@ -118,7 +125,7 @@ Programy zawarte w tym pakiecie to: %endif %patch10 -p1 -mv man/pt_BR man/pt +%{__mv} man/pt_BR man/pt %{__perl} -pi -e 's@GNU/Linux@TLD Linux@' m4/host-os.m4 @@ -130,7 +137,7 @@ mv man/pt_BR man/pt # fmt: memory exhausted %{__sed} -i -e 25,27d tests/fmt/base.pl -# /etc/resolv.conf is blocked in pld builders, try some other file +# /etc/resolv.conf is blocked in tld builders, try some other file %{__sed} -i -e 's,/etc/resolv.conf,/etc/hosts,' gnulib-tests/test-read-file.c # getgid needs to be fixed: @@ -168,9 +175,10 @@ build-aux/gen-lists-of-programs.sh --automake > src/cu-progs.mk %{?with_multicall:--enable-single-binary=symlinks} \ --disable-silent-rules \ --enable-install-program=arch \ - --enable-no-install-program=hostname,kill,uptime + --enable-no-install-program=hostname,kill,uptime \ + %{!?with_y2038:--disable-year2038} -%{__make} +%{__make} -j1 %if %{with tests} sed -i -e 's#COLUMNS##g' tests/envvar-check @@ -184,20 +192,20 @@ install -d $RPM_BUILD_ROOT{/bin,/sbin,%{_bindir},%{_sbindir},/etc/shrc.d} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -mv $RPM_BUILD_ROOT%{_bindir}/{arch,basename,cat,chgrp,chmod,chown,cp,date,dd,\ +%{__mv} $RPM_BUILD_ROOT%{_bindir}/{arch,basename,cat,chgrp,chmod,chown,cp,date,dd,\ df,echo,false,id,link,ln,ls,mkdir,mknod,mktemp,mv,nice,printf,pwd,readlink,rm,rmdir,\ sleep,sort,stat,stty,sync,touch,true,unlink,uname} $RPM_BUILD_ROOT/bin %if %{with multicall} -mv $RPM_BUILD_ROOT{%{_bindir},/bin}/coreutils +%{__mv} $RPM_BUILD_ROOT{%{_bindir},/bin}/coreutils ln -s ../../bin/coreutils $RPM_BUILD_ROOT%{_bindir} %endif -mv $RPM_BUILD_ROOT%{_bindir}/chroot $RPM_BUILD_ROOT%{_sbindir} +%{__mv} $RPM_BUILD_ROOT%{_bindir}/chroot $RPM_BUILD_ROOT%{_sbindir} cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir} cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir} -cp -p %{SOURCE4} %{SOURCE5} $RPM_BUILD_ROOT/etc/shrc.d +cp -p %{SOURCE4} %{SOURCE5} %{SOURCE7} $RPM_BUILD_ROOT/etc/shrc.d for d in cs da de es fi fr hu id it ja ko nl pl pt ru zh_CN; do install -d $RPM_BUILD_ROOT%{_mandir}/$d/man1 @@ -208,8 +216,6 @@ cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/pl/man1/mktemp.1 rm -f $RPM_BUILD_ROOT%{_mandir}/*/man1/{hostname,kill,su,uptime}.1 # always remove, never packaged but sometimes installed rm -f $RPM_BUILD_ROOT%{_infodir}/dir -# remove locales not available in the system -rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/sr/LC_TIME %find_lang %{name} @@ -264,6 +270,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/b2sum %attr(755,root,root) %{_bindir}/base32 %attr(755,root,root) %{_bindir}/base64 +%attr(755,root,root) %{_bindir}/basenc %attr(755,root,root) %{_bindir}/chcon %attr(755,root,root) %{_bindir}/cksum %attr(755,root,root) %{_bindir}/comm @@ -339,12 +346,14 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/DIR_COLORS.256color %config(noreplace) /etc/shrc.d/colorls.csh %config(noreplace) /etc/shrc.d/colorls.sh -%dir %{_libdir}/coreutils -%attr(755,root,root) %{_libdir}/coreutils/libstdbuf.so +%config(noreplace) /etc/shrc.d/%{name}.sh +%dir %{_libexecdir}/coreutils +%attr(755,root,root) %{_libexecdir}/coreutils/libstdbuf.so %{_mandir}/man1/arch.1* %{_mandir}/man1/b2sum.1* %{_mandir}/man1/base32.1* %{_mandir}/man1/base64.1* +%{_mandir}/man1/basenc.1* %{_mandir}/man1/basename.1* %{_mandir}/man1/cat.1* %{_mandir}/man1/chcon.1*