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: 05-Feb-2003 15:32:27
Branch: HEAD Handle: 2003020514322402
Modified files:
openpkg-src/openpkg dot.bash_login dot.bashrc openpkg.boot
openpkg.spec
openpkg-web news.txt
Log:
move bash environment setup into .bash_login; use %config(noreplace)
for them plus rc.conf
Summary:
Revision Changes Path
1.2 +26 -0 openpkg-src/openpkg/dot.bash_login
1.3 +0 -29 openpkg-src/openpkg/dot.bashrc
1.19 +2 -1 openpkg-src/openpkg/openpkg.boot
1.133 +5 -5 openpkg-src/openpkg/openpkg.spec
1.3203 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/dot.bash_login
============================================================================
$ cvs diff -u -r1.1.1.1 -r1.2 dot.bash_login
--- openpkg-src/openpkg/dot.bash_login 18 Sep 2001 09:48:33 -0000 1.1.1.1
+++ openpkg-src/openpkg/dot.bash_login 5 Feb 2003 14:32:26 -0000 1.2
@@ -2,6 +2,32 @@
## @l_prefix@/.bash_login -- Local Bash Login Script
##
+# provide user and host information in default prompt
+PS1="\u@\h\$ "
+
+# environment permissions
+umask 022
+ulimit -c 16384
+
+# history functionality
+shopt -s histappend
+HISTSIZE=100
+HISTFILESIZE=100
+
+# various additional variables
+export TMPDIR=/tmp
+export TEMPDIR=$TMPDIR
+export BLOCKSIZE=1024
+
+# suck in the whole Bourne-Shell
+# environment of OpenPKG hierarchy
+eval `@l_prefix@/etc/rc --eval all env`
+
+# make sure some non-standard but usually
+# important executable directories are active
+test -d /usr/ccs/bin && PATH="$PATH:/usr/ccs/bin"
+test -d /usr/local/bin && PATH="$PATH:/usr/local/bin"
+
# initially adjust $PWD to symbolic path
cd $HOME
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/dot.bashrc
============================================================================
$ cvs diff -u -r1.2 -r1.3 dot.bashrc
--- openpkg-src/openpkg/dot.bashrc 16 Jan 2002 08:22:19 -0000 1.2
+++ openpkg-src/openpkg/dot.bashrc 5 Feb 2003 14:32:26 -0000 1.3
@@ -2,32 +2,3 @@
## @l_prefix@/.bashrc -- Local Bash Profile
##
-# provide user and host information in default prompt
-PS1="\u@\h\$ "
-
-# environment permissions
-umask 022
-ulimit -c 16384
-
-# history functionality
-shopt -s histappend
-HISTSIZE=100
-HISTFILESIZE=100
-
-# various additional variables
-export TMPDIR=/tmp
-export TEMPDIR=$TMPDIR
-export BLOCKSIZE=1024
-
-# suck in the whole Bourne-Shell
-# environment of OpenPKG hierarchy
-eval `@l_prefix@/etc/rc --eval all env`
-
-# make sure some non-standard but usually
-# important executable directories are active
-test -d /usr/ccs/bin && PATH="$PATH:/usr/ccs/bin"
-test -d /usr/local/bin && PATH="$PATH:/usr/local/bin"
-
-# path to us
-BASH_ENV=$HOME/.bashrc
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.boot
============================================================================
$ cvs diff -u -r1.18 -r1.19 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 28 Jan 2003 16:43:15 -0000 1.18
+++ openpkg-src/openpkg/openpkg.boot 5 Feb 2003 14:32:26 -0000 1.19
@@ -469,7 +469,8 @@
files=`cat $spec |\
sed -e '1,/%files/d' -e '/%clean/,$d' |\
grep -v '^ *$' | grep -v '%defattr' |\
- sed -e 's;%config *;;' -e 's;%dir *;;' -e 's;%{l_prefix}/;;' -e 's;^ *;;' -e
"s;%{V_rpm};${V_rpm};"`
+ sed -e 's;%config *;;' -e 's;%config(noreplace) *;;' \
+ -e 's;%dir *;;' -e 's;%{l_prefix}/;;' -e 's;^ *;;' -e
"s;%{V_rpm};${V_rpm};"`
for dbfile in Basenames Conflictname Group Name Packages Providename \
Requirename Triggername; do
files="$files RPM/DB/$dbfile"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.132 -r1.133 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 4 Feb 2003 19:16:57 -0000 1.132
+++ openpkg-src/openpkg/openpkg.spec 5 Feb 2003 14:32:26 -0000 1.133
@@ -39,8 +39,8 @@
# o any cc(1)
# the package version and release
-%define V_openpkg 20030204
-%define R_openpkg 20030204
+%define V_openpkg 20030205
+%define R_openpkg 20030205
# the used software versions
%define V_rpm 4.0.2
@@ -704,8 +704,8 @@
%files
%defattr(-,%{?l_musr}%{!?l_musr:%{l_fsusr}},%{?l_mgrp}%{!?l_mgrp:%{l_fsgrp}})
%{l_prefix}/README
- %{l_prefix}/.bashrc
- %{l_prefix}/.bash_login
+ %config(noreplace) %{l_prefix}/.bashrc
+ %config(noreplace) %{l_prefix}/.bash_login
%dir %{l_prefix}/RPM
%dir %{l_prefix}/RPM/SRC
%dir %{l_prefix}/RPM/PKG
@@ -717,7 +717,7 @@
%{l_prefix}/bin/rpm
%dir %{l_prefix}/etc
%{l_prefix}/etc/rc
- %config %{l_prefix}/etc/rc.conf
+ %config(noreplace) %{l_prefix}/etc/rc.conf
%{l_prefix}/etc/rc.func
%dir %{l_prefix}/etc/rc.d
%{l_prefix}/etc/rc.d/rc.openpkg
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3202 -r1.3203 news.txt
--- openpkg-web/news.txt 5 Feb 2003 13:52:21 -0000 1.3202
+++ openpkg-web/news.txt 5 Feb 2003 14:32:24 -0000 1.3203
@@ -1,3 +1,4 @@
+05-Feb-2003: Upgraded package: P<openpkg-20030205-20030205>
05-Feb-2003: Upgraded package: P<sendmail-8.12.7-20030205>
05-Feb-2003: Upgraded package: P<aica-0.81-20030205>
05-Feb-2003: Upgraded package: P<gcc-3.2.2-20030205>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
