- src.rpm should contain all of the patches, to make bcond build possible

[packages/bash.git] / bash.spec

diff --git a/bash.spec b/bash.spec
index 6fc729db79ec150ca6b64760dd681c3d61354275..d0244ab3b996ecf6063a481cf485681418f8dddb 100644 (file)
--- a/bash.spec
+++ b/bash.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
-# _without_static - don't build static version
-# _with_bash_history - build with additional history in /var/log/hist ;)
+# _without_static      - don't build static version
+# _with_bash_history   - build with additional history in /var/log/hist ;)
 #
 Summary:       GNU Bourne Again Shell (bash)
 Summary(es):   GNU Bourne Again Shell (bash)
@@ -12,15 +12,17 @@ Summary(ru):        GNU Bourne Again Shell (bash)
 Summary(uk):   GNU Bourne Again Shell (bash)
 Name:          bash
 Version:       2.05b
-Release:       9%{?_with_bash_history:inv}
+Release:       10%{?_with_bash_history:inv}
 License:       GPL
 Group:         Applications/Shells
 Source0:       ftp://ftp.gnu.org/pub/gnu/bash/%{name}-%{version}.tar.gz
+# Source0-md5: 5238251b4926d778dfe162f6ce729733
 Source1:       %{name}rc
 Source2:       %{name}-skel-.%{name}_logout
 Source3:       %{name}-skel-.%{name}_profile
 Source4:       %{name}-skel-.%{name}rc
 Source5:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
+# Source5-md5: d2aacf89c4a444c5da648da69afdb01a
 Patch0:                %{name}-paths.patch
 Patch1:                %{name}-security.patch
 Patch2:                %{name}-autoconf.patch
@@ -32,12 +34,15 @@ Patch7:             %{name}-shellfunc.patch
 Patch8:                %{name}-DESTDIR.patch
 Patch9:                %{name}-rlimit_locks.patch
 Patch10:       %{name}-sighup.patch
-%{?_with_bash_history:Patch11:bash-backup_history.patch}
+Patch11:       %{name}-backup_history.patch
 Patch12:       ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-001
 Patch13:       ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-002
 Patch14:       ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-003
 Patch15:       ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-004
-Patch16:       %{name}-pmake.patch
+Patch16:       ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-005
+Patch17:       ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-006
+Patch18:       ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-007
+Patch19:       %{name}-pmake.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
@@ -198,7 +203,10 @@ tym pakiecie jest statycznie zlinkowany bash.
 %patch13 -p0
 %patch14 -p0
 %patch15 -p0
-%patch16 -p1
+%patch16 -p0
+%patch17 -p0
+%patch18 -p0
+%patch19 -p1
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -228,10 +236,10 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/{bin,etc/skel}
-
 %{?_with_bash_history:install -d $RPM_BUILD_ROOT/var/log/bash_hist}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 mv -f $RPM_BUILD_ROOT%{_bindir}/bash $RPM_BUILD_ROOT/bin
 %{?_without_static:#}install   bash.static $RPM_BUILD_ROOT/bin