From mboxrd@z Thu Jan  1 00:00:00 1970
From: kupcevic@sourceware.org <kupcevic@sourceware.org>
Date: 3 Aug 2006 20:53:16 -0000
Subject: [Cluster-devel] conga ./conga.spec.in.in luci/Makefile luci/si ...
Message-ID: <20060803205316.8788.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-03 20:53:15

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

Log message:
	chown luci:luci /var/lib/luci
	chmod 700       /var/lib/luci

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6

--- conga/conga.spec.in.in	2006/07/26 18:03:55	1.20
+++ conga/conga.spec.in.in	2006/08/03 20:53:15	1.21
@@ -143,7 +143,7 @@
 				%{_libdir}/luci/
 %endif
 				%{_docdir}/luci-%{version}/
-%defattr(-,luci,root)
+%defattr(-,luci,luci)
 				%{_localstatedir}/lib/luci
 
 %pre -n luci
@@ -482,7 +482,7 @@
 * Tue Jun 27 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-6
 - Luci persists users/clusters/systems/permissions across upgrades 
 * Fri Jun 16 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-4
-- Moved storage, service, log and rpm modules into main ricci.rpm.
+- Moved storage, service, log and rpm modules into main ricci.rpm
 * Wed Jun 14 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-1
 - Packaged cluster-snmp (cluster snmp agent)
 - Packaged cluster-cim (cluster CIM provider)
--- conga/luci/Makefile	2006/07/24 20:17:01	1.12
+++ conga/luci/Makefile	2006/08/03 20:53:15	1.13
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.12 2006/07/24 20:17:01 kupcevic Exp $
+# $Id: Makefile,v 1.13 2006/08/03 20:53:15 kupcevic Exp $
 ZOPEINSTANCE=/var/lib/luci
 
 include ../make/version.in
@@ -28,6 +28,11 @@
 	if [ "${include_zope_and_plone}" = "yes" ] ; then \
 		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
 	make -C utils install
 	make -C init.d install
--- conga/luci/site/Makefile	2006/08/03 18:44:04	1.5
+++ conga/luci/site/Makefile	2006/08/03 20:53:15	1.6
@@ -39,10 +39,6 @@
 
 
 install:
-	install -d ${DESTDIR}/var
-	install -d ${DESTDIR}/var/lib/
-	install -d ${DESTDIR}/var/lib/luci
-
 	install -d ${DESTDIR}/var/lib/luci/bin
 #	install `find luci/bin -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/bin
 	install luci/bin/runzope ${DESTDIR}/var/lib/luci/bin