[interchange-cvs] interchange - jon modified 2 files
interchange-core@interchange.redhat.com
interchange-core@interchange.redhat.com
Mon Apr 29 18:56:01 2002
User: jon
Date: 2002-04-29 22:55:46 GMT
Modified: SPECS Tag: STABLE_4_8-branch interchange-wrapper
Modified: interchange.spec
Log:
Fix some RPM problems, and:
* Start daemon in UNIX mode only by default (for RPM only).
* Build foundation-demo RPM with MV_DEMO_MODE set.
Revision Changes Path
No revision
No revision
1.1.2.2 +18 -13 interchange/SPECS/Attic/interchange-wrapper
rev 1.1.2.2, prev_rev 1.1.2.1
Index: interchange-wrapper
===================================================================
RCS file: /var/cvs/interchange/SPECS/Attic/interchange-wrapper,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -u -r1.1.2.1 -r1.1.2.2
--- interchange-wrapper 29 Apr 2002 19:49:52 -0000 1.1.2.1
+++ interchange-wrapper 29 Apr 2002 22:55:46 -0000 1.1.2.2
@@ -4,21 +4,26 @@
# Calls Interchange with special locations of files as installed by RPM
# http://interchange.redhat.com/
-RUNSTRING="%{_libdir}/interchange/bin/interchange \\
- --unix \\
- -configfile $ETCBASE/interchange.cfg \\
- -pidfile $RUNBASE/interchange/interchange.pid \\
- -logfile $LOGBASE/interchange/error.log \\
- ErrorFile=$LOGBASE/interchange/error.log \\
- PIDfile=$RUNBASE/interchange/interchange.pid \\
- -confdir $ICBASE/etc \\
- -rundir $RUNBASE/interchange \\
- SocketFile=$RUNBASE/interchange/socket \\
+ICBASE=/usr/lib/interchange
+ETCBASE=/etc
+RUNBASE=/var/run
+LOGBASE=/var/log
+
+RUNSTRING="$ICBASE/interchange/bin/interchange \
+ --unix \
+ -configfile $ETCBASE/interchange.cfg \
+ -pidfile $RUNBASE/interchange/interchange.pid \
+ -logfile $LOGBASE/interchange/error.log \
+ ErrorFile=$LOGBASE/interchange/error.log \
+ PIDfile=$RUNBASE/interchange/interchange.pid \
+ -confdir $ICBASE/etc \
+ -rundir $RUNBASE/interchange \
+ SocketFile=$RUNBASE/interchange/socket \
IPCsocket=$RUNBASE/interchange/socket.ipc"
-if test "\`whoami\`" = root
+if test "`whoami`" = root
then
- exec su %ic_user -c "\$RUNSTRING \$*"
+ exec su interch -c "$RUNSTRING $*"
else
- exec \$RUNSTRING \$*
+ exec $RUNSTRING $*
fi
2.4.2.10 +12 -7 interchange/SPECS/interchange.spec
rev 2.4.2.10, prev_rev 2.4.2.9
Index: interchange.spec
===================================================================
RCS file: /var/cvs/interchange/SPECS/interchange.spec,v
retrieving revision 2.4.2.9
retrieving revision 2.4.2.10
diff -u -u -r2.4.2.9 -r2.4.2.10
--- interchange.spec 29 Apr 2002 20:31:55 -0000 2.4.2.9
+++ interchange.spec 29 Apr 2002 22:55:46 -0000 2.4.2.10
@@ -166,7 +166,8 @@
--catuser=%ic_user \
--mailorderto=%{ic_user}@$HOST \
cachedir=$CACHEDIR/$i \
- logdir=$LOGDIR/$i
+ logdir=$LOGDIR/$i \
+ demomode=1
done
# Clean up empty placeholder files used to keep CVS from pruning away
@@ -203,14 +204,14 @@
%pre
-/sbin/service interchange stop > /dev/null 2>&1
+/sbin/service interchange stop > /dev/null 2>&1 || :
# Create interch user/group if they don't already exist
[ -z "`grep ^%{ic_group}: /etc/group`" ] && \
- /usr/sbin/groupadd -g 52 %ic_group
+ /usr/sbin/groupadd -g 52 %ic_group || :
[ -z "`grep ^%{ic_user}: /etc/passwd`" ] && \
- /usr/sbin/useradd -u 52 -c "Interchange server" \
- -s /bin/bash -r -d %{_localstatedir}/lib/interchange %ic_user
+ /usr/sbin/useradd -u 52 -g interch -c "Interchange server" \
+ -s /bin/bash -r -d %{_localstatedir}/lib/interchange %ic_user || :
%files foundation
@@ -345,7 +346,9 @@
fi
# Remove Catalog directive from interchange.cfg
- perl -pi -e "s/^\s*Catalog\s+$i\s[^\n]+\n//i" %{_sysconfdir}/interchange.cfg
+ if [ -e %{_sysconfdir}/interchange.cfg ]; then
+ perl -pi -e "s/^\s*Catalog\s+$i\s[^\n]+\n//i" %{_sysconfdir}/interchange.cfg
+ fi
# Remove leftover machine-generated files
rm -rf %{_localstatedir}/cache/interchange/$i/tmp/*
@@ -368,8 +371,10 @@
%changelog
* Mon Apr 29 2002 Jon Jensen <jon@redhat.com> 4.8.4-9
+- Request uid and gid to be 52, Red Hat's assigned numbers for Interchange.
+- Start IC daemon in UNIX mode only by default.
+- Build foundation-demo with MV_DEMO_MODE set by default.
- Back out Stronghold index.html patch.
-- Force uid and gid to be 52, Red Hat's assigned numbers for Interchange.
- Adapt a few more Gary-isms (manpage filelist, NOCPANINSTALL setting).
* Fri Feb 15 2002 Jon Jensen <jon@redhat.com> 4.8.4-8