Author: glen Date: Tue Jan 10 03:16:32 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- add five official patches for bash 3.1 (use vim like versioning)
- --enable-separate-helpfiles, binary is 40k smaller on i686
- _distribution and _patchlevel gone since bash-2.05-release already
---- Files affected:
SPECS:
bash.spec (1.157 -> 1.158)
---- Diffs:
================================================================
Index: SPECS/bash.spec
diff -u SPECS/bash.spec:1.157 SPECS/bash.spec:1.158
--- SPECS/bash.spec:1.157 Fri Dec 9 09:03:20 2005
+++ SPECS/bash.spec Tue Jan 10 04:16:26 2006
@@ -4,15 +4,19 @@
%bcond_without static # don't build static version
%bcond_with bash_history # build with additional history in
/var/log/bash_hist ;)
##
+%define _ver 3.1
+%define _patchlevel 005
+%define _rel 1
+#
Summary: GNU Bourne Again Shell (bash)
Summary(fr): Le shell Bourne Again de GNU
Summary(pl): Powłoka GNU Bourne Again Shell (bash)
Name: bash
-Version: 3.1
-Release: 2%{?with_bash_history:inv}
+Version: %{_ver}.%{_patchlevel}
+Release: %{_rel}%{?with_bash_history:inv}
License: GPL
Group: Applications/Shells
-Source0: ftp://ftp.gnu.org/pub/gnu/bash/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.gnu.org/pub/gnu/bash/%{name}-%{_ver}.tar.gz
# Source0-md5: ef5304c4b22aaa5088972c792ed45d72
Source1: %{name}rc
Source2: %{name}-skel-.%{name}_logout
@@ -31,6 +35,11 @@
Patch9: %{name}-backup_history.patch
Patch10: %{name}-pmake.patch
Patch11: %{name}-act_like_sh.patch
+Patch101: ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-001
+Patch102: ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-002
+Patch103: ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-003
+Patch104: ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-004
+Patch105: ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-005
URL: http://www.gnu.org/software/bash/
BuildRequires: autoconf
BuildRequires: automake
@@ -175,7 +184,14 @@
tym pakiecie jest wersja basha skonsolidowana statycznie.
%prep
-%setup -q -a5
+%setup -q -n %{name}-%{_ver} -a5
+# official patches
+%patch101 -p0
+%patch102 -p0
+%patch103 -p0
+%patch104 -p0
+%patch105 -p0
+
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -188,9 +204,6 @@
#%patch10 -p1 -- no longer needed?
%patch11 -p1
-echo %{version} > _distribution
-echo %{release} > _patchlevel
-
%build
%{__autoconf}
cp -f /usr/share/automake/config.* support
@@ -205,6 +218,7 @@
--with-curses \
--enable-extended-glob \
--enable-dparen-arithmetic \
+ --enable-separate-helpfiles \
--without-bash-malloc \
`[ "$mode" = "static" ] && echo "--enable-static-link"` \
--with-installed-readline
@@ -217,7 +231,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{bin,etc/skel}
+install -d $RPM_BUILD_ROOT{/bin,/etc/skel,%{_datadir}/%{name}}
%{?with_bash_history:install -d $RPM_BUILD_ROOT/var/log/bash_hist}
%{__make} install \
@@ -240,6 +254,7 @@
install %{SOURCE2} $RPM_BUILD_ROOT/etc/skel/.bash_logout
install %{SOURCE3} $RPM_BUILD_ROOT/etc/skel/.bash_profile
install %{SOURCE4} $RPM_BUILD_ROOT/etc/skel/.bashrc
+rm -f $RPM_BUILD_ROOT/usr/share/info/dir
%find_lang %{name}
@@ -312,6 +327,7 @@
%lang(ko) %{_mandir}/ko/man1/*
%lang(nl) %{_mandir}/nl/man1/*
%lang(pl) %{_mandir}/pl/man1/*
+%{_datadir}/%{name}
%if %{with static}
%files static
@@ -325,6 +341,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.158 2006/01/10 03:16:26 glen
+- add five official patches for bash 3.1 (use vim like versioning)
+- --enable-separate-helpfiles, binary is 40k smaller on i686
+- _distribution and _patchlevel gone since bash-2.05-release already
+
Revision 1.157 2005/12/09 08:03:20 qboosh
- release 2 (3.1-1 crashes when updated before readline)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/bash.spec?r1=1.157&r2=1.158&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
