OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 25-Jul-2003 15:15:08
Branch: HEAD Handle: 2003072514150602
Modified files:
openpkg-src/bash bash.spec profile
openpkg-web news.txt
Log:
cleanup packaging
Summary:
Revision Changes Path
1.36 +16 -3 openpkg-src/bash/bash.spec
1.7 +2 -2 openpkg-src/bash/profile
1.5807 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bash/bash.spec
============================================================================
$ cvs diff -u -r1.35 -r1.36 bash.spec
--- openpkg-src/bash/bash.spec 21 Jul 2003 13:31:56 -0000 1.35
+++ openpkg-src/bash/bash.spec 25 Jul 2003 13:15:08 -0000 1.36
@@ -37,7 +37,7 @@
Group: Shell
License: GPL
Version: %{V_real}
-Release: 20030721
+Release: 20030725
# list of sources
Source0: ftp://ftp.cwru.edu/pub/bash/bash-%{V_real}.tar.gz
@@ -76,6 +76,7 @@
%patch6 -p0
%build
+ # configure package
( # force disabled wide-character support
echo "ac_cv_header_wchar_h=no"
echo "ac_cv_header_wctype_h=no"
@@ -100,18 +101,29 @@
%{l_shtool} subst \
-e 's;/etc/profile;%{l_prefix}/etc/bash/profile;' \
doc/bash.1
+
+ # build package
%{l_make} %{l_mflags}
%install
+ # install package
rm -rf $RPM_BUILD_ROOT
- %{l_make} %{l_mflags} install prefix=$RPM_BUILD_ROOT%{l_prefix}
+ %{l_make} %{l_mflags} install \
+ prefix=$RPM_BUILD_ROOT%{l_prefix}
+
+ # strip down installation
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/bashbug.1
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/bashbug
strip $RPM_BUILD_ROOT%{l_prefix}/bin/bash
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/bash
+
+ # install global configuration
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/bash
%{l_shtool} install -c -m 644 %{l_value -s -a} \
%{SOURCE profile} $RPM_BUILD_ROOT%{l_prefix}/etc/bash/
+
+ # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%config %{l_prefix}/etc/bash/profile'
@@ -123,6 +135,7 @@
%post
if [ ".$1" = .1 ]; then
+ # display note about login shell prerequisite
if [ -f /etc/shells ]; then
if [ ".`grep $RPM_INSTALL_PREFIX/bin/bash /etc/shells`" = . ]; then
( echo "Hint: To use $RPM_INSTALL_PREFIX/bin/bash as the login"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bash/profile
============================================================================
$ cvs diff -u -r1.6 -r1.7 profile
--- openpkg-src/bash/profile 2 Apr 2003 10:04:23 -0000 1.6
+++ openpkg-src/bash/profile 25 Jul 2003 13:15:08 -0000 1.7
@@ -1,5 +1,5 @@
##
-## @l_prefix@/etc/bash/profile -- Global Bash Profile
+## @l_prefix@/etc/bash/profile -- Global GNU Bash Profile
##
# welcome and goodbye message ;)
@@ -90,7 +90,7 @@
fi
}
-# suck in the Bourne-Shell environment of all OpenPKG packages
+# load the Bourne-Shell environment of all installed OpenPKG packages
eval [EMAIL PROTECTED]@/etc/rc --eval all env`
# path to user environment init script
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5806 -r1.5807 news.txt
--- openpkg-web/news.txt 25 Jul 2003 10:04:05 -0000 1.5806
+++ openpkg-web/news.txt 25 Jul 2003 13:15:06 -0000 1.5807
@@ -1,3 +1,4 @@
+25-Jul-2003: Upgraded package: P<bash-2.05b-20030725>
25-Jul-2003: Upgraded package: P<coreutils-5.0.1-20030725>
25-Jul-2003: Upgraded package: P<mozilla-1.4-20030725>
25-Jul-2003: Upgraded package: P<zebra-0.93b-20030725>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
