- patchlevel 004 (version: 5.1.4)

- disable Provides generation for private dynamic modules

diff --git a/bash.spec b/bash.spec
index 7b2c6832fa527d24352f513b11d06cff2f3ce13d..e6d3f17f60916269e5c4675a3bb827cdef16da39 100644 (file)
--- a/bash.spec
+++ b/bash.spec
@@ -7,7 +7,7 @@
 %bcond_without tests   # do not perform "make test"
 
 %define                ver             5.1
-%define                patchlevel      0
+%define                patchlevel      4
 %define                rel             1
 %define                min_readline    8.1
 Summary:       GNU Bourne Again Shell (bash)
@@ -39,7 +39,7 @@ Patch9:               %{name}-backup_history.patch
 Patch10:       %{name}-act_like_sh.patch
 Patch11:       %{name}-elinks_cont.patch
 Patch12:       bash-5.1-parallel_make.patch
-%patchset_source -f https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-%03g 1 %{patchlevel}
+%patchset_source -f https://ftp.gnu.org/gnu/bash/bash-5.1-patches/bash51-%03g 1 %{patchlevel}
 URL:           http://www.gnu.org/software/bash/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake
@@ -63,6 +63,8 @@ Obsoletes:    bash2-doc
 Obsoletes:     etcskel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _noautoprovfiles        %{_libdir}/%{name}
+
 %description
 Bash is a GNU project sh-compatible shell or command language
 interpreter. Bash (Bourne Again shell) incorporates useful features
@@ -211,7 +213,7 @@ Pliki nagłówkowe do tworzenia wtyczek basha.
 %patch11 -p1
 %patch12 -p1
 
-sed -i -e 's#/usr/bin/printf#/bin/printf#g' tests/intl2.sub
+%{__sed} -i -e 's#/usr/bin/printf#/bin/printf#g' tests/intl2.sub
 
 %build
 cp -f /usr/share/automake/config.* support
@@ -236,7 +238,7 @@ for mode in %{?with_static:static} shared; do
        DEFS="-DHAVE_CONFIG_H -D_GNU_SOURCE"
 
 if [ "$mode" = "static" ]; then
-       mv -f bash bash.static
+       %{__mv} bash bash.static
 fi
 done
 

diff --git a/sources b/sources
index 95ceb796aebe90fd0c4fddc015cfc7375059b583..d6086dee09e1f99f78cf18677df6bb5593c5d776 100644 (file)
--- a/sources
+++ b/sources
@@ -1,18 +1,4 @@
-b026862ab596a5883bb4f0d1077a3819  bash50-001
-2f4a7787365790ae57f36b311701ea7e  bash50-002
-af7f2dd93fd5429fb5e9a642ff74f87d  bash50-003
-b60545b273bfa4e00a760f2c648bed9c  bash50-004
-875a0bedf48b74e453e3997c84b5d8a4  bash50-005
-4a8ee95adb72c3aba03d9e8c9f96ece6  bash50-006
-411560d81fde2dc5b17b83c3f3b58c6f  bash50-007
-dd7cf7a784d1838822cad8d419315991  bash50-008
-c1b3e937cd6dccbb7fd772f32812a0da  bash50-009
-19b41e73b03602d0e261c471b53e670c  bash50-010
-414339330a3634137081a97f2c8615a8  bash50-011
-1870268f62b907221b078ad109e1fa94  bash50-012
-40d923af4b952b01983ed4c889ae2653  bash50-013
-57857b22053c8167677e5e5ac5c6669b  bash50-014
-c4c6ea23d09a74eaa9385438e48fdf02  bash50-015
-a682ed6fa2c2e7a7c3ba6bdeada07fb5  bash50-016
-d9dcaa1d8e7a24850449a1aac43a12a9  bash50-017
-a64d950d5de72ae590455b13e6afefcb  bash50-018
+57641ddbf92fca25df92a443e36f285a  bash51-001
+aed44842ed1a05fcfc3ef146991fdaef  bash51-002
+bf96455600a86420d69f5166575192dd  bash51-003
+d2c524dba0eea5dc5f00849cc84376a0  bash51-004