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: 10-Jul-2003 09:19:37
Branch: HEAD Handle: 2003071008193502
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rc rc.openpkg
openpkg-web news.txt
Log:
rename openpkg_runall to openpkg_rc_all, support new openpkg_rc_def
Summary:
Revision Changes Path
1.9 +1 -0 openpkg-src/openpkg/HISTORY
1.170 +1 -1 openpkg-src/openpkg/openpkg.spec
1.27 +9 -2 openpkg-src/openpkg/rc
1.9 +41 -37 openpkg-src/openpkg/rc.openpkg
1.5489 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.8 -r1.9 HISTORY
--- openpkg-src/openpkg/HISTORY 9 Jul 2003 12:42:03 -0000 1.8
+++ openpkg-src/openpkg/HISTORY 10 Jul 2003 07:19:37 -0000 1.9
@@ -2,6 +2,7 @@
2003
====
+20030710 rename openpkg_runall to openpkg_rc_all, support new openpkg_rc_def.
20030709 fully work-off rc script
20030709 make sure l_fsl_{ldflags,libs} do not produce an error if fsl-config is
not existing
20030709 change syntax of append/prepend feature for %{l_cppflags} and %{l_ldflags}
macros; fix DB autoconf checks
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.169 -r1.170 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 9 Jul 2003 08:22:42 -0000 1.169
+++ openpkg-src/openpkg/openpkg.spec 10 Jul 2003 07:19:37 -0000 1.170
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030709
+%define V_openpkg 20030710
# the used software versions
%define V_rpm 4.0.2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
============================================================================
$ cvs diff -u -r1.26 -r1.27 rc
--- openpkg-src/openpkg/rc 9 Jul 2003 12:52:42 -0000 1.26
+++ openpkg-src/openpkg/rc 10 Jul 2003 07:19:37 -0000 1.27
@@ -185,7 +185,13 @@
if [ ".$scripts" = ".all" ]; then
isall=1
. $rcconf
- case "$openpkg_runall" in
+ if [ ".$openpkg_runall" != . ]; then
+ echo "openpkg:rc:WARNING: variable \"openpkg_runall\" was renamed to
\"openpkg_rc_all\"." 1>&2
+ echo "openpkg:rc:WARNING: value of deprecated variable \"openpkg_runall\"
taken over for compatibility." 1>&2
+ echo "openpkg:rc:WARNING: please update your local configuration in
\"$rcconf\"." 1>&2
+ openpkg_rc_all="$openpkg_runall"
+ fi
+ case "$openpkg_rc_all" in
[Nn][Oo] | [Ff][Aa][Ll][Ss][Ee] | [Oo][Ff][Ff] | 0 ) exit 0 ;;
esac
scripts=`/bin/ls $rcdir/rc.* | sed -e "s;^$rcdir/rc\.;;"`
@@ -354,7 +360,8 @@
fi
if [ ".$print" = .1 -o ".$eval" = .1 ]; then
echo ". $rcfunc" >>$tmpfile
- l_scripts=`/bin/ls $rcdir/rc.* | sed -e "s;^$rcdir/rc\.;;"`
+ l_scripts=`/bin/ls $rcdir/rc.* | sed -e "s;^$rcdir/rc\.;;" | egrep -v
'^openpkg$' | sort`
+ l_scripts="openpkg $l_scripts"
for l_name in $l_scripts; do
sed <$rcdir/rc.$l_name >>$tmpfile -e "1,/^%config/d" -e '/^%.*/,$d'
done
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc.openpkg
============================================================================
$ cvs diff -u -r1.8 -r1.9 rc.openpkg
--- openpkg-src/openpkg/rc.openpkg 7 Jul 2003 21:59:29 -0000 1.8
+++ openpkg-src/openpkg/rc.openpkg 10 Jul 2003 07:19:37 -0000 1.9
@@ -25,45 +25,49 @@
##
%config
- openpkg_runall="yes"
+ openpkg_rc_def="yes"
+ openpkg_rc_all="$openpkg_rc_def"
+ openpkg_enable="$openpkg_rc_def"
openpkg_envprio="high"
%env -p0
- # determine append (low prio) or prepend (high prio) mode
- opt_prepend=""
- if [ ".$openpkg_envprio" = ".high" ]; then
- opt_prepend="-p"
- fi
-
- # make sure the software package executables are found
- export PATH
- opPathAdd -e PATH \
- /bin /sbin /usr/bin /usr/sbin
- opPathAdd ${opt_prepend} PATH \
- @l_prefix@/bin @l_prefix@/sbin \
- @l_prefix@/local/bin @l_prefix@/local/sbin
-
- # make sure the software package manual pages are found
- export MANPATH
- opPathAdd -e MANPATH \
- /usr/man /usr/share/man
- opPathAdd ${opt_prepend} MANPATH \
- @l_prefix@/man @l_prefix@/local/man
-
- # make sure the software package info pages are found
- export INFOPATH
- opPathAdd -e INFOPATH \
- /usr/info /usr/share/info
- opPathAdd ${opt_prepend} INFOPATH \
- @l_prefix@/info @l_prefix@/local/info
-
- # make sure the software package libraries are found
- export LD_LIBRARY_PATH
- opPathAdd -e LD_LIBRARY_PATH \
- /lib /usr/lib
- opPathAdd ${opt_prepend} LD_LIBRARY_PATH \
- @l_prefix@/lib @l_prefix@/local/lib
+ if opServiceEnable openpkg; then
+ # determine append (low prio) or prepend (high prio) mode
+ opt_prepend=""
+ if [ ".$openpkg_envprio" = ".high" ]; then
+ opt_prepend="-p"
+ fi
+
+ # make sure the software package executables are found
+ export PATH
+ opPathAdd -e PATH \
+ /bin /sbin /usr/bin /usr/sbin
+ opPathAdd ${opt_prepend} PATH \
+ @l_prefix@/bin @l_prefix@/sbin \
+ @l_prefix@/local/bin @l_prefix@/local/sbin
+
+ # make sure the software package manual pages are found
+ export MANPATH
+ opPathAdd -e MANPATH \
+ /usr/man /usr/share/man
+ opPathAdd ${opt_prepend} MANPATH \
+ @l_prefix@/man @l_prefix@/local/man
+
+ # make sure the software package info pages are found
+ export INFOPATH
+ opPathAdd -e INFOPATH \
+ /usr/info /usr/share/info
+ opPathAdd ${opt_prepend} INFOPATH \
+ @l_prefix@/info @l_prefix@/local/info
+
+ # make sure the software package libraries are found
+ export LD_LIBRARY_PATH
+ opPathAdd -e LD_LIBRARY_PATH \
+ /lib /usr/lib
+ opPathAdd ${opt_prepend} LD_LIBRARY_PATH \
+ @l_prefix@/lib @l_prefix@/local/lib
- # cleanup environment
- unset opt_prepend
+ # cleanup environment
+ unset opt_prepend
+ fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5488 -r1.5489 news.txt
--- openpkg-web/news.txt 9 Jul 2003 23:10:15 -0000 1.5488
+++ openpkg-web/news.txt 10 Jul 2003 07:19:35 -0000 1.5489
@@ -1,3 +1,4 @@
+10-Jul-2003: Upgraded package: P<openpkg-20030710-20030710>
10-Jul-2003: Upgraded package: P<libmcrypt-2.5.7-20030710>
09-Jul-2003: Upgraded package: P<tomcat-adapter-3.2.4-20030709>
09-Jul-2003: Upgraded package: P<j2se14-1.4.2-20030709>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
