[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] conga ./Makefile ./autogen.sh ricci/Makefile r ...



CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe sourceware org	2008-02-19 18:37:40

Modified files:
	.              : Makefile autogen.sh 
	ricci          : Makefile autogen.sh 
	ricci/modules/cluster/clumon: Makefile 
Added files:
	.              : ricci.spec.in.in 
	ricci/docs     : Makefile 

Log message:
	Add a makefile target and spec file to allow building a ricci srpm separate from luci

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci.spec.in.in.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/autogen.sh.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/autogen.sh.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/docs/Makefile.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8

/cvs/cluster/conga/ricci.spec.in.in,v  -->  standard output
revision 1.1
--- conga/ricci.spec.in.in
+++ -	2008-02-19 18:37:41.142573000 +0000
@@ -0,0 +1,135 @@
+###############################################################################
+#
+# Copyright (C) 2006-2008 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License version 2.
+#
+###############################################################################
+
+Name: ricci
+Version: @@VERS@@
+Release: @@REL@@%{?dist}
+License: GPLv2
+URL: http://sources.redhat.com/cluster/
+Group: System Environment/Base
+Summary: Remote Management System - Managed Station
+Summary: Remote Cluster and Storage Management System
+Source0: %{name}-%{version}.tar.gz
+Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+
+BuildRequires: python-devel >= 2.4.1
+BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
+BuildRequires: cman-devel
+BuildRequires: cyrus-sasl-devel >= 2.1
+BuildRequires: openssl-devel dbus-devel pkgconfig file
+
+Requires: initscripts
+Requires: oddjob dbus openssl pam cyrus-sasl >= 2.1
+Requires: sed util-linux
+Requires: modcluster >= 0.10.0
+# modstorage
+Requires: parted util-linux
+# modservice
+Requires: chkconfig initscripts
+
+Requires(pre): grep shadow-utils
+Requires(post): chkconfig initscripts util-linux
+Requires(preun): chkconfig initscripts
+Requires(postun): initscripts util-linux
+
+%description
+Conga is a project developing management system for remote stations.
+It consists of luci, https frontend, and ricci, secure daemon that dispatches
+incoming messages to underlying management modules.
+
+%prep
+%setup -q
+
+%build
+%configure --arch=%{_arch} --docdir=%{_docdir}
+make %{?_smp_mflags} ricci
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install_ricci
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%description -n ricci
+Conga is a project developing management system for remote stations.
+It consists of luci, https frontend, and ricci, secure daemon that dispatches
+incoming messages to underlying management modules.
+
+This package contains listening daemon (dispatcher), as well as
+reboot, rpm, storage, service and log management modules.
+
+%files -n ricci
+%defattr(-,root,root)
+# ricci
+%config(noreplace)	%{_sysconfdir}/pam.d/ricci
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci.systembus.conf
+			%{_sysconfdir}/rc.d/init.d/ricci
+%attr(-,ricci,ricci)	%{_localstatedir}/lib/ricci
+			%{_sbindir}/ricci
+%attr(-,root,ricci)	%{_libexecdir}/ricci/
+			%{_docdir}/ricci-%{version}/
+# modrpm
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modrpm.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modrpm.systembus.conf
+			%{_libexecdir}/ricci-modrpm
+# modstorage
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modstorage.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modstorage.systembus.conf
+			%{_libexecdir}/ricci-modstorage
+# modservice
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modservice.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modservice.systembus.conf
+			%{_libexecdir}/ricci-modservice
+# modlog
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modlog.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modlog.systembus.conf
+			%{_libexecdir}/ricci-modlog
+
+%pre -n ricci
+if ! /bin/grep ^ricci\:x /etc/group >&/dev/null; then
+	/usr/sbin/groupadd -r -f ricci >&/dev/null
+fi
+if ! /bin/grep ^ricci\:x /etc/passwd >&/dev/null; then
+	/usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >&/dev/null
+fi
+exit 0
+
+%post -n ricci
+DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null`
+/bin/kill -s SIGHUP $DBUS_PID >&/dev/null
+/sbin/service oddjobd reload >&/dev/null
+/sbin/chkconfig --add ricci
+exit 0
+
+%preun -n ricci
+if [ "$1" == "0" ]; then
+	/sbin/service ricci stop >&/dev/null
+	/sbin/chkconfig --del ricci
+fi
+exit 0
+
+%postun -n ricci
+if [ "$1" == "0" ]; then
+	DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null`
+	/bin/kill -s SIGHUP $DBUS_PID >&/dev/null
+	/sbin/service oddjobd reload >&/dev/null
+fi
+if [ "$1" == "1" ]; then
+	/sbin/service ricci condrestart >&/dev/null
+fi
+exit 0
+
+
+%changelog
+* Tue Jan 22 2008 Ryan McCabe <rmccabe redhat com> 0.12.0-0
+- Empty
--- conga/Makefile	2008/01/15 04:41:41	1.15
+++ conga/Makefile	2008/02/19 18:37:39	1.16
@@ -13,6 +13,7 @@
 TMP_DIR=..
 CONGA_DIRNAME=conga-${VERSION}
 CLUSTERMON_DIRNAME=clustermon-${VERSION}
+RICCI_DIRNAME=ricci-${VERSION}
 
 .PHONY: conga ricci luci clustermon
 
@@ -83,6 +84,19 @@
 		rpmbuild --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs conga.spec ; \
 	fi
 
+ricci_srpm: clean
+	rm -rf ${TMP_DIR}/${RICCI_DIRNAME}
+	mkdir ${TMP_DIR}/${RICCI_DIRNAME}
+	cp -r ricci/* ricci.spec.* make ${TMP_DIR}/${RICCI_DIRNAME}
+	find ${TMP_DIR}/${CLUSTERMON_DIRNAME} -type d -name CVS -print0 | xargs -0 rm -rf || true
+	tar -zcf ${RICCI_DIRNAME}.tar.gz ${TMP_DIR}/${RICCI_DIRNAME}
+	rm -rf ${TMP_DIR}/${RICCI_DIRNAME}
+	if [ -n "${DISTRO}" ] ; then \
+		rpmbuild --define "dist .${DISTRO}" --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs ricci.spec ; \
+	else \
+		rpmbuild --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs ricci.spec ; \
+	fi
+
 clustermon_srpm: clean
 	rm -rf ${TMP_DIR}/${CLUSTERMON_DIRNAME}
 	cp -r . ${TMP_DIR}/${CLUSTERMON_DIRNAME}
--- conga/autogen.sh	2007/09/20 06:22:45	1.7
+++ conga/autogen.sh	2008/02/19 18:37:39	1.8
@@ -100,6 +100,11 @@
 	| sed -e s/@@REL@@/$RELEASE/g \
 	> clustermon.spec
 
+cat ricci.spec.in.in \
+	| sed -e s/@@VERS@@/$VERSION/g \
+	| sed -e s/@@REL@@/$RELEASE/g \
+	> ricci.spec
+
 cd ricci ; ./autogen.sh $@ ; cd ..
 cd luci ; ./autogen.sh $@ ; cd ..
 
--- conga/ricci/Makefile	2008/01/02 20:47:34	1.14
+++ conga/ricci/Makefile	2008/02/19 18:37:40	1.15
@@ -8,6 +8,7 @@
 ##
 ################################################################################
 
+include make/version.in
 include make/defines.mk
 
 .PHONY: ricci
@@ -33,6 +34,7 @@
 	${MAKE} -C modules install
 	${MAKE} -C init.d install
 	${MAKE} -C pam.d install
+	${MAKE} -C docs install
 	${INSTALL_DIR} ${docdir}/ricci-${VERSION}/
 	${INSTALL_FILE} COPYING ${docdir}/ricci-${VERSION}/
 
--- conga/ricci/autogen.sh	2006/07/24 20:17:02	1.2
+++ conga/ricci/autogen.sh	2008/02/19 18:37:40	1.3
@@ -4,4 +4,5 @@
 
 
 # satisfy makes' includes
+cp ../make/version.in make/
 cp make/defines.mk.in make/defines.mk
/cvs/cluster/conga/ricci/docs/Makefile,v  -->  standard output
revision 1.1
--- conga/ricci/docs/Makefile
+++ -	2008-02-19 18:37:41.713865000 +0000
@@ -0,0 +1,3 @@
+all:
+
+install:
--- conga/ricci/modules/cluster/clumon/Makefile	2008/01/02 20:47:35	1.7
+++ conga/ricci/modules/cluster/clumon/Makefile	2008/02/19 18:37:40	1.8
@@ -11,6 +11,7 @@
 top_srcdir=../../..
 UNINSTALL=${top_srcdir}/scripts/uninstall.pl
 
+include ${top_srcdir}/make/version.in
 include ${top_srcdir}/make/defines.mk
 
 all:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]