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

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-07-16 22:21:31

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

Log message:
	Fix an install bug, and silence rpm -V after a successful install.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.79&r2=1.80
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14

--- conga/conga.spec.in.in	2007/07/16 21:11:18	1.79
+++ conga/conga.spec.in.in	2007/07/16 22:21:31	1.80
@@ -118,6 +118,7 @@
 
 
 %files -n luci
+%verify(not size md5 mtime) /var/lib/luci/var/Data.fs
 %defattr(-,root,root)
 %config(noreplace)		%{_sysconfdir}/sysconfig/luci
 				%{_sysconfdir}/rc.d/init.d/luci
--- conga/luci/site/Makefile	2007/06/25 16:03:38	1.13
+++ conga/luci/site/Makefile	2007/07/16 22:21:31	1.14
@@ -53,7 +53,9 @@
 	install -m 644 luci/etc/zope.conf ${DESTDIR}/var/lib/luci/etc
 
 	install -d ${DESTDIR}/var/lib/luci/Extensions
-	install -m 644 `find luci/Extensions -maxdepth 1 -type f | grep .py | grep -v \~ | grep -v \#` ${DESTDIR}/var/lib/luci/Extensions
+	install -m 644 `find luci/Extensions -maxdepth 1 -type f -name \*.py | grep -v \~ | grep -v \#` ${DESTDIR}/var/lib/luci/Extensions
+	install -d ${DESTDIR}/var/lib/luci/Extensions/ClusterModel
+	install -m 644 `find luci/Extensions/ClusterModel -maxdepth 1 -type f -name \*.py | grep -v \~ | grep -v \#` ${DESTDIR}/var/lib/luci/Extensions/ClusterModel
 
 	install -d ${DESTDIR}/var/lib/luci/import
 #	install -m 644 `find luci/import -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/import