[rhmessaging-commits] rhmessaging commits: r2087 - in store/trunk/cpp: etc and 1 other directory.

Thu May 29 15:46:53 EDT 2008

Author: nunofsantos
Date: 2008-05-29 15:46:53 -0400 (Thu, 29 May 2008)
New Revision: 2087

Removed:
   store/trunk/cpp/etc/rhmd
   store/trunk/cpp/etc/rhmd.sh
Modified:
   store/trunk/cpp/Makefile.am
   store/trunk/cpp/rhm.spec.in
Log:
BZ448931: remove rhmd initscript

Modified: store/trunk/cpp/Makefile.am
===================================================================

--- store/trunk/cpp/Makefile.am	2008-05-29 16:22:36 UTC (rev 2086)
+++ store/trunk/cpp/Makefile.am	2008-05-29 19:46:53 UTC (rev 2087)
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = 1.9.6 foreign
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = README etc/rhmd etc/rhmd.conf etc/rhmd.sh
+EXTRA_DIST = README etc/rhmd.conf
 
 sysconf_DATA = etc/rhmd.conf
 

Deleted: store/trunk/cpp/etc/rhmd
===================================================================
--- store/trunk/cpp/etc/rhmd	2008-05-29 16:22:36 UTC (rev 2086)
+++ store/trunk/cpp/etc/rhmd	2008-05-29 19:46:53 UTC (rev 2087)
@@ -1,86 +0,0 @@
-#!/bin/bash
-#
-# rhmd        Startup script for the RHM messaging daemon (Qpid messaging daemon with bdbstore enabled)
-#
-
-### BEGIN INIT INFO
-# Provides: qpidd
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: start or stop qpidd with persistent store
-# Description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protocol.
-### END INIT INFO
-
-# chkconfig: - 85 15
-# description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protocol.
-# processname: qpidd
-
-prog=qpidd
-lockfile=/var/lock/subsys/rhmd
-pidfile=/var/run/rhmd.pid
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-if [ -f /etc/sysconfig/rhmd ] ; then
-	. /etc/sysconfig/rhmd
-fi
-
-RETVAL=0
-
-start() {
-	echo -n $"Starting RHM daemon: "
-	runuser -s /bin/sh qpidd -c "qpidd --daemon --config=/etc/rhmd.conf"
-	RETVAL=$?
-        if [ $RETVAL = 0 ] ; then success ; else failure ; fi
-	echo
-	[ $RETVAL = 0 ] && touch $lockfile
-	if [ $RETVAL = 0 ]; then
-	    touch $pidfile
-	    chown qpidd.qpidd $pidfile
-	    runuser -s /bin/sh qpidd -c "qpidd -c > $pidfile"
-	fi
-	return $RETVAL
-}
-
-stop() {
-	echo -n $"Stopping RHM daemon: "
-	killproc -p ${pidfile} $prog
-	RETVAL=$?
-	echo
-	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
-}
-
-reload() {
-	echo 1>&2 $"$0: reload not supported"
-	exit 3
-}
-
-restart() {
-	stop
-	start
-}
-
-# See how we were called.
-case "$1" in
-  start|stop|restart|reload)
-	$1
-	;;
-  status)
-	status $prog | sed 's/qpidd/rhmd/'
-	RETVAL=$?
-	;;
-  force-reload)
-	restart
-	;;
-  try-restart)
-	[ -e $lockfile ] && restart || :
-	;;
-  *)
-	echo 1>&2 $"Usage: $0 {start|stop|restart|condrestart|status}"
-	exit 1
-esac
-
-exit $RETVAL

Deleted: store/trunk/cpp/etc/rhmd.sh
===================================================================
--- store/trunk/cpp/etc/rhmd.sh	2008-05-29 16:22:36 UTC (rev 2086)
+++ store/trunk/cpp/etc/rhmd.sh	2008-05-29 19:46:53 UTC (rev 2087)
@@ -1,4 +0,0 @@
-#!/bin/bash
-echo $* | grep -e --config >/dev/null || CONFIG=--config=/etc/rhmd.conf 
-/usr/sbin/qpidd $CONFIG $*
-

Modified: store/trunk/cpp/rhm.spec.in
===================================================================
--- store/trunk/cpp/rhm.spec.in	2008-05-29 16:22:36 UTC (rev 2086)
+++ store/trunk/cpp/rhm.spec.in	2008-05-29 19:46:53 UTC (rev 2087)
@@ -1,9 +1,13 @@
 #
 # Spec file for Red Hat Messaging package rhm.
 #
+
+%define svnrev xxx
+# built against qpidc svn rev xxx
+
 Name:           rhm
 Version:        @VERSION@
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Red Hat extensions to the Qpid messaging system
 Group:          System Environment/Libraries
 License:        LGPL
@@ -21,6 +25,7 @@
 BuildRequires: e2fsprogs-devel
 BuildRequires: libaio-devel
 BuildRequires: python
+BuildRequires: libtool
 
 Requires: qpidd
 Requires: db4
@@ -43,12 +48,11 @@
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-install -Dp -m0755 etc/rhmd %{buildroot}%{_initrddir}/rhmd
-install -Dp -m0755 etc/rhmd.sh %{buildroot}%{_sbindir}/rhmd
-install -d  -m0775 %{buildroot}%{_localstatedir}/rhm
 rm -f %{buildroot}%_libdir/*.a
 rm -f %{buildroot}%_libdir/*.la
 rm -f %{buildroot}%_libdir/*.so
+install -d -m0755 %{buildroot}%{_localstatedir}/lib/qpidd
+install -Dp -m0755 %_libdir/libbdbstore.so.0* %{buildroot}%{_localstatedir}/lib/qpidd
 
 %clean
 rm -rf %{buildroot}
@@ -59,33 +63,15 @@
 %files
 %defattr(-,root,root,-)
 %doc README COPYING
-%_libdir/libbdbstore.so.0
-%_libdir/libbdbstore.so.0.1.0
-%_initrddir/rhmd
-%_sbindir/rhmd
-%attr(0775,qpidd,qpidd) %dir %_localstatedir/rhm
+%{_localstatedir}/lib/qpidd/libbdbstore.so.0
+%{_localstatedir}/lib/qpidd/libbdbstore.so.0.1.0
 %config(noreplace) %_sysconfdir/rhmd.conf
 
-%post
-# This adds the proper /etc/rc*.d links for the script
-/sbin/chkconfig --add qpidd
-/sbin/ldconfig
 
-%preun
-# Check that this is actual deinstallation, not just removing for upgrade.
-if [ $1 = 0 ]; then
-  /sbin/service rhmd stop >/dev/null 2>&1 || :
-  /sbin/chkconfig --del rhmd
-fi
-
-%postun
-if [ "$1" -ge "1" ]; then
-  /sbin/service rhmd condrestart >/dev/null 2>&1 || :
-fi
-/sbin/ldconfig
-
-
 %changelog
+* Thu May 29 2008 Nuno Santos <nsantos at nsantos.bos.redhat.com> - 0.2-21
+- BZ448931: remove initscript for rhmd, and shell startup script
+
 * Mon Apr 14 2008 Kim van der Riet <kim.vdriet at redhat.com> - 0.2-20
 - removed cppunit as build dependency - all tests now boost test
 


