OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 14-Aug-2003 11:39:10
Branch: HEAD Handle: 2003081410390802
Modified files:
openpkg-src/mico mico.spec rc.mico
openpkg-web news.txt
Log:
Complete for compliance with features described by ticket #202
Summary:
Revision Changes Path
1.49 +22 -1 openpkg-src/mico/mico.spec
1.12 +7 -2 openpkg-src/mico/rc.mico
1.6165 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mico/mico.spec
============================================================================
$ cvs diff -u -r1.48 -r1.49 mico.spec
--- openpkg-src/mico/mico.spec 13 Aug 2003 16:08:17 -0000 1.48
+++ openpkg-src/mico/mico.spec 14 Aug 2003 09:39:10 -0000 1.49
@@ -33,7 +33,7 @@
Group: System
License: LGPL/GPL
Version: 2.3.10
-Release: 20030813
+Release: 20030814
# package options
%option with_ssl no
@@ -201,4 +201,25 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%pre
+ # before upgrade, save status and stop service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} mico status 2>/dev/null | tee %{l_tmpfile}`
+ %{l_rc} mico stop 2>/dev/null
+ exit 0
+
+%post
+ if [ $1 -eq 2 ]; then
+ # after upgrade, restore status
+ eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}
+ [ ".$mico_active" = .yes ] && %{l_rc} mico start
+ fi
+ exit 0
+
+%preun
+ # before erase, stop service
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} mico stop 2>/dev/null
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mico/rc.mico
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.mico
--- openpkg-src/mico/rc.mico 22 Jul 2003 08:10:51 -0000 1.11
+++ openpkg-src/mico/rc.mico 14 Aug 2003 09:39:10 -0000 1.12
@@ -7,8 +7,10 @@
mico_enable="$openpkg_rc_def"
mico_micod="no"
mico_nsd="no"
- mico_nsd_args="-ORBGIOPVersion 1.2 -ORBIIOPVersion 1.2 -ORBIIOPAddr inet:`uname
-n`:8914"
- mico_micod_args="-ORBGIOPVersion 1.2 -ORBIIOPVersion 1.2 -ORBIIOPAddr
inet:`uname -n`:8912"
+ mico_ip_micod="127.0.0.1"
+ mico_ip_nsd="127.0.0.1"
+ mico_micod_args="-ORBGIOPVersion 1.2 -ORBIIOPVersion 1.2 -ORBIIOPAddr
inet:${mico_ip_micod}:8912"
+ mico_nsd_args="-ORBGIOPVersion 1.2 -ORBIIOPVersion 1.2 -ORBIIOPAddr
inet:${mico_ip_nsd}:8914"
%common
mico_micod_pidfile="@l_prefix@/var/mico/micod.pid"
@@ -41,6 +43,7 @@
%start -u @l_rusr@
rcService mico enable yes || exit 0
+ rcService mico active yes && exit 0
# run the object adapter daemon for dynamic object activation
if rcVarIsYes mico_micod; then
@l_prefix@/bin/micod ${mico_micod_args} &
@@ -54,12 +57,14 @@
%stop -u @l_rusr@
rcService mico enable yes || exit 0
+ rcService mico active no && exit 0
mico_signal TERM
rm -f $mcio_micod_pidfile 2>/dev/null || true
rm -f $mcio_nsd_pidfile 2>/dev/null || true
%restart -u @l_rusr@
rcService mico enable yes || exit 0
+ rcService mico active no && exit 0
rc mico stop
sleep 2
rc mico start
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6164 -r1.6165 news.txt
--- openpkg-web/news.txt 14 Aug 2003 08:59:14 -0000 1.6164
+++ openpkg-web/news.txt 14 Aug 2003 09:39:08 -0000 1.6165
@@ -1,3 +1,4 @@
+14-Aug-2003: Upgraded package: P<mico-2.3.10-20030814>
14-Aug-2003: Upgraded package: P<unixodbc-2.2.6-20030814>
14-Aug-2003: Upgraded package: P<grepmail-5.10-20030814>
14-Aug-2003: Upgraded package: P<perl-mail-20030814-20030814>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
