From mboxrd@z Thu Jan  1 00:00:00 1970
From: kupcevic@sourceware.org <kupcevic@sourceware.org>
Date: 4 Aug 2006 17:55:25 -0000
Subject: [Cluster-devel] conga ./conga.spec.in.in luci/Makefile ricci/M ...
Message-ID: <20060804175525.11108.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-08-04 17:55:25

Modified files:
	.              : conga.spec.in.in 
	luci           : Makefile 
	ricci          : Makefile 
	ricci/ricci    : Makefile 

Log message:
	chown luci:luci /var/lib/luci
	chmod 700 /var/lib/luci
	
	chown luci:luci /usr/lib/luci
	chmod 700 /usr/lib/luci/zope
	
	chown ricci:ricci /var/lib/ricci
	chmod 700 /var/lib/ricci

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14

--- conga/conga.spec.in.in	2006/08/03 23:39:00	1.23
+++ conga/conga.spec.in.in	2006/08/04 17:55:24	1.24
@@ -139,11 +139,11 @@
 %config(noreplace)		%{_sysconfdir}/sysconfig/luci
 				%{_sysconfdir}/rc.d/init.d/luci
 				%{_sbindir}/luci_admin
+				%{_docdir}/luci-%{version}/
+%defattr(-,luci,luci)
 %if "%{include_zope_and_plone}" == yes
 				%{_libdir}/luci/
 %endif
-				%{_docdir}/luci-%{version}/
-%defattr(-,luci,luci)
 				%{_localstatedir}/lib/luci
 
 %pre -n luci
@@ -240,7 +240,7 @@
 %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,root)	%{_localstatedir}/lib/ricci
+%attr(-,ricci,ricci)	%{_localstatedir}/lib/ricci
 			%{_sbindir}/ricci
 %attr(4755,root,root)	%{_sbindir}/ricci-auth
 			%{_sbindir}/ricci-worker
--- conga/luci/Makefile	2006/08/03 20:53:15	1.13
+++ conga/luci/Makefile	2006/08/04 17:55:24	1.14
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 2006/08/03 20:53:15 kupcevic Exp $
+# $Id: Makefile,v 1.14 2006/08/04 17:55:24 kupcevic Exp $
 ZOPEINSTANCE=/var/lib/luci
 
 include ../make/version.in
@@ -20,17 +20,18 @@
 
 install:
 	if [ "${include_zope_and_plone}" = "yes" ] ; then \
+		install -d ${libdir}/luci ; \
+		install -d -m 700 ${libdir}/luci/zope ; \
 		cd zope ; \
 		./configure --prefix=${libdir}/luci/zope --with-python=/usr/bin/python ; \
 		make ; \
 		make install ; \
 	fi
 	if [ "${include_zope_and_plone}" = "yes" ] ; then \
+		install -d ${libdir}/luci/zope/lib/python/Products ; \
 		cp -R plone/* ${libdir}/luci/zope/lib/python/Products/ ; \
 	fi
 
-	install -d ${DESTDIR}/var
-	install -d ${DESTDIR}/var/lib/
 	install -d -m 700 ${DESTDIR}/var/lib/luci
 
 	make -C site install
--- conga/ricci/Makefile	2006/07/05 21:33:46	1.9
+++ conga/ricci/Makefile	2006/08/04 17:55:24	1.10
@@ -23,6 +23,7 @@
 
 
 install: 
+	$(INSTALL_DIR) -m 700 ${localstatedir}/lib/ricci
 	make -C ricci install
 	make -C modules install
 	make -C init.d install
--- conga/ricci/ricci/Makefile	2006/07/25 19:10:18	1.13
+++ conga/ricci/ricci/Makefile	2006/08/04 17:55:24	1.14
@@ -53,7 +53,6 @@
 	$(INSTALL_BIN)  ${TARGET} ${sbindir}
 	$(INSTALL_BIN)  ${TARGET_AUTH} ${sbindir}
 	$(INSTALL_BIN)  ${TARGET_WORKER} ${sbindir}
-	$(INSTALL_DIR)  ${localstatedir}/lib/ricci
 	$(INSTALL_DIR)  ${localstatedir}/lib/ricci/queue
 	$(INSTALL_DIR)  ${localstatedir}/lib/ricci/certs
 	$(INSTALL_FILE) cacert.config ${localstatedir}/lib/ricci/certs/