Bump to 4.3.25

[platform/upstream/bash.git] / packaging / bash.spec

diff --git a/packaging/bash.spec b/packaging/bash.spec
index 25761b3..d672c41 100644 (file)
--- a/packaging/bash.spec
+++ b/packaging/bash.spec
@@ -1,15 +1,17 @@
 Name:           bash
-Version:        4.2
+Version:        4.3.25
 Release:        1
 License:        GPL-3.0+
 Summary:        The GNU Bourne Again shell
 Url:            http://www.gnu.org/software/bash
-Group:          System/Shells
-Source0:        ftp://ftp.gnu.org/gnu/bash/%{name}-%{version}.tar.gz
+Group:          Base/Utilities
+Source0:        %{name}-%{version}.tar.gz
 Source1:        dot.bashrc
 Source2:        dot.profile
+Source1001:    bash.manifest
 BuildRequires:  autoconf
 BuildRequires:  bison
+BuildRequires:  fdupes
 Provides:      /bin/bash
 Provides:      /bin/sh
 
@@ -22,6 +24,7 @@ incorporates useful features from the Korn shell (ksh) and the C shell
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 %configure --enable-largefile \
@@ -41,10 +44,7 @@ make check
 %install
 %make_install
 
-mkdir -p %{buildroot}/etc
-
-#mkdir -p %{buildroot}/%{_bindir}
-#mv %{buildroot}/bin/* %{buildroot}/%{_bindir}/
+mkdir -p %{buildroot}/etc/bash_completion.d
 
 # make manpages for bash builtins as per suggestion in DOC/README
 pushd doc
@@ -58,12 +58,14 @@ b
 }
 d
 ' builtins.1 > man.pages
+# '
 for i in echo pwd test kill; do
   perl -pi -e "s,$i,,g" man.pages
   perl -pi -e "s,  , ,g" man.pages
 done
 
 install -c -m 644 builtins.1 %{buildroot}%{_mandir}/man1/builtins.1
+install -c -m 644 bash.1 %{buildroot}%{_mandir}/man1/bash.1
 
 for i in `cat man.pages` ; do
   echo .so man1/builtins.1 > %{buildroot}%{_mandir}/man1/$i.1
@@ -90,23 +92,14 @@ LONG_BIT=$(getconf LONG_BIT)
 mv %{buildroot}%{_bindir}/bashbug \
    %{buildroot}%{_bindir}/bashbug-"${LONG_BIT}"
 
-# Fix missing sh-bangs in example scripts (bug #225609).
-for script in \
-  examples/scripts/krand.bash \
-  examples/scripts/bcsh.sh \
-  examples/scripts/precedence \
-  examples/scripts/shprompt
-do
-  cp "$script" "$script"-orig
-  echo '#!/bin/bash' > "$script"
-  cat "$script"-orig >> "$script"
-  rm -f "$script"-orig
-done
-
 rm -rf %{buildroot}%{_bindir}/bashbug-*
 chmod a-x doc/*.sh
 
+# remove duplicate manpages
+%fdupes -s %{buildroot}/%{_mandir}
+
 %docs_package
+%doc %{_datadir}/doc/%{name}/*
 
 %post -p <lua>
 bashfound = false;
@@ -152,6 +145,11 @@ fi
 
 
 %files
+%manifest %{name}.manifest
+%license COPYING
 %{_bindir}/sh
 %{_bindir}/bash
-%{_sysconfdir}/skel
+%config %attr(644,root,root) %{_sysconfdir}/skel/.bashrc
+%config %attr(644,root,root) %{_sysconfdir}/skel/.bash_profile
+%dir %{_sysconfdir}/bash_completion.d
+