X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=coreutils.spec;h=5a9bc11e8de88cc66ddb7b4a99e5798072814080;hb=refs%2Fheads%2Fmaster;hp=5d37ac64c17b0f9e559a672d7163660da774eaec;hpb=d564be8ce1adc5b7cafc85bc0f141df7f24200e9;p=packages%2Fcoreutils.git

diff --git a/coreutils.spec b/coreutils.spec
index 5d37ac6..5a9bc11 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -8,12 +8,12 @@
 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:	9.1
+Version:	9.5
 Release:	1
 License:	GPL v3+
 Group:		Applications/System
 Source0:	http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
-# Source0-md5:	8b1ca4e018a7dce9bb937faec6618671
+# Source0-md5:	e99adfa059a63db3503cc71f3d151e31
 Source1:	%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	f7c986ebc74ccb8d08ed70141063f14c
 Source2:	DIR_COLORS
@@ -29,8 +29,6 @@ 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
 # https://github.com/jarun/advcpmv
 Patch9:		%{name}-advcopy.patch
 Patch10:	tests.patch
@@ -45,6 +43,7 @@ BuildRequires:	gmp-devel
 BuildRequires:	help2man
 BuildRequires:	libcap-devel
 BuildRequires:	libselinux-devel
+BuildRequires:	perl-base
 BuildRequires:	rpmbuild(find_lang) >= 1.24
 BuildRequires:	smack-devel
 BuildRequires:	tar >= 1:1.22
@@ -59,11 +58,11 @@ Provides:	mktemp = %{version}-%{release}
 Provides:	sh-utils
 Provides:	stat
 Provides:	textutils
-Obsoletes:	fileutils
-Obsoletes:	mktemp
-Obsoletes:	sh-utils
-Obsoletes:	stat
-Obsoletes:	textutils
+Obsoletes:	fileutils < 4.2
+Obsoletes:	mktemp < 1.6
+Obsoletes:	sh-utils < 2.1
+Obsoletes:	stat < 3.4
+Obsoletes:	textutils < 1:2.2
 Conflicts:	shadow < 1:4.0.3-6
 Conflicts:	tetex < 1:2.0.2
 # ensure util-linux has su included
@@ -108,8 +107,6 @@ Programy zawarte w tym pakiecie to:
 
 %prep
 %setup -q -a1
-# translationproject seems to be older than in 9.0
-#%patch8 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -143,8 +140,8 @@ Programy zawarte w tym pakiecie to:
 # getgid needs to be fixed:
 # getgid: missing operand
 # Try `getgid --help' for more information.
-%{__rm} tests/misc/help-version.sh
-%{__sed} -i -e '/misc\/help-version/d' tests/local.mk
+%{__rm} tests/help/help-version.sh
+%{__sed} -i -e '/help\/help-version/d' tests/local.mk
 
 # fails on some filesystems (like XFS), where readdir returns d_type=DT_UNKNOWN
 %{__rm} tests/ls/stat-free-color.sh
@@ -156,8 +153,8 @@ Programy zawarte w tym pakiecie to:
 
 # mksh is too smart for those, won't let programs fail on ulimit
 # would need bash here
-%{__rm} tests/misc/sort-merge-fdlimit.sh
-%{__sed} -i -e '/misc\/sort-merge-fdlimit/d' tests/local.mk
+%{__rm} tests/sort/sort-merge-fdlimit.sh
+%{__sed} -i -e '/sort\/sort-merge-fdlimit/d' tests/local.mk
 %{__rm} tests/split/r-chunk.sh
 %{__sed} -i -e '/split\/r-chunk/d' tests/local.mk
 
@@ -171,7 +168,6 @@ build-aux/gen-lists-of-programs.sh --automake > src/cu-progs.mk
 %{__automake}
 %configure \
 	CFLAGS="%{rpmcflags} -DSYSLOG_SUCCESS -DSYSLOG_FAILURE -DSYSLOG_NON_ROOT" \
-	DEFAULT_POSIX2_VERSION=199209 \
 	%{?with_multicall:--enable-single-binary=symlinks} \
 	--disable-silent-rules \
 	--enable-install-program=arch \