[Cluster-devel] conga ./conga.spec.in.in luci/Makefile luci/si ...

[kupcevic@sourceware.org <kupcevic@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-08-04 22:14:32

Modified files:
	.              : conga.spec.in.in 
	luci           : Makefile 
	luci/site      : Makefile 
Added files:
	luci/utils     : remove_files 

Log message:
	luci: remove zope/plone files not used by luci (incomplete list)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.24&r2=1.25
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/utils/remove_files.diff?cvsroot=cluster&r1=NONE&r2=1.1

--- conga/conga.spec.in.in	2006/08/04 17:55:24	1.24
+++ conga/conga.spec.in.in	2006/08/04 22:14:32	1.25
@@ -76,7 +76,6 @@
 ln -s ../%{plone_archive} luci/plone
 cd luci/plone
 %patch2 -p1
-rm -rf Five README.txt
 cd $CURRENT_DIR
 %endif
 
@@ -466,7 +465,6 @@
 
 %changelog
 * Thu Aug 03 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-10
-- Added zopectl to luci
 - Luci: fix login issues, add cluster resources, styling... 
 * Wed Jul 26 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-9
 - Update Luci to Plone 2.5
--- conga/luci/Makefile	2006/08/04 18:04:05	1.15
+++ conga/luci/Makefile	2006/08/04 22:14:32	1.16
@@ -1,10 +1,19 @@
-# $Id: Makefile,v 1.15 2006/08/04 18:04:05 kupcevic Exp $
+# $Id: Makefile,v 1.16 2006/08/04 22:14:32 kupcevic Exp $
 ZOPEINSTANCE=/var/lib/luci
 
 include ../make/version.in
 include make/defines.mk
 
 
+
+
+# list zope/plone files and/or directories to be removed 
+# (paths relative to zope/plone installation directory)
+ZOPE_REMOVES="bin include skel zopeskel"
+PLONE_REMOVES="Five README.txt"
+
+
+
 all: luci
 
 luci:
@@ -25,15 +34,17 @@
 		./configure --prefix=${libdir}/luci/zope --with-python=/usr/bin/python ; \
 		make ; \
 		make install ; \
+		cd .. ; \
 		chmod 700 ${libdir}/luci/zope ; \
+		utils/remove_files ${libdir}/luci/zope ${ZOPE_REMOVES} ; \
 	fi
 	if [ "${include_zope_and_plone}" = "yes" ] ; then \
 		install -d ${libdir}/luci/zope/lib/python/Products ; \
+		utils/remove_files plone ${PLONE_REMOVES} ; \
 		cp -R plone/* ${libdir}/luci/zope/lib/python/Products/ ; \
 	fi
 
 	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 20:53:15	1.6
+++ conga/luci/site/Makefile	2006/08/04 22:14:32	1.7
@@ -42,7 +42,7 @@
 	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
-	install luci/bin/zopectl ${DESTDIR}/var/lib/luci/bin
+#	install luci/bin/zopectl ${DESTDIR}/var/lib/luci/bin
 
 	install -d ${DESTDIR}/var/lib/luci/etc
 #	install `find luci/etc -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/etc
/cvs/cluster/conga/luci/utils/remove_files,v  -->  standard output
revision 1.1
--- conga/luci/utils/remove_files
+++ -	2006-08-04 22:14:32.954174000 +0000
@@ -0,0 +1,19 @@
+# !/bin/bash
+
+
+if [ $# -eq 0 ] ; then
+    echo "Remove FILES from DIR"
+    echo "Usage:"
+    echo "    $0 <DIR> <FILES>"
+    exit 1
+fi
+
+DIR=$1
+shift
+REMOVE_US=$@
+
+for p in $REMOVE_US; do
+    pth=$DIR/$p
+    echo "Removing $pth"
+    rm -rf $pth
+done