SPECS: scalix.spec - strict deps, %config flags, cosmetics

[glen]

Author: glen                         Date: Wed Apr  1 10:20:31 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- strict deps, %config flags, cosmetics

---- Files affected:
SPECS:
   scalix.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: SPECS/scalix.spec
diff -u SPECS/scalix.spec:1.26 SPECS/scalix.spec:1.27
--- SPECS/scalix.spec:1.26	Wed Apr  1 10:00:29 2009
+++ SPECS/scalix.spec	Wed Apr  1 12:20:26 2009
@@ -88,7 +88,7 @@
 %package sac
 Summary:	Scalix SAC
 Group:		Applications/WWW
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description sac
 SAC for Scalix
@@ -96,7 +96,7 @@
 %package sis
 Summary:	Scalix SIS
 Group:		Applications/WWW
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description sis
 SIS for Scalix
@@ -112,23 +112,25 @@
 %patch1 -p0
 
 %build
-
-CLASSPATH=caa/build/WEB-INF/classes:res/build/WEB-INF/classes:lib/spring.jar:lib/hibernate3.jar:lib/c3p0-0.9.1.jar:$(build-classpath activation antlr asm2 commons-cli commons-codec commons-collections commons-el commons-httpclient commons-lang commons-logging ical4j log4j lucene lucene-snowball jasper-compiler jasper-runtime jdom jsp-api saaj servlet xalan xercesImpl)
+required_jars="
+	activation antlr asm2 commons-cli commons-codec commons-collections commons-el
+	commons-httpclient commons-lang commons-logging ical4j log4j lucene lucene-snowball jasper-compiler
+	jasper-runtime jdom jsp-api saaj servlet xalan xercesImpl
+"
+CLASSPATH=caa/build/WEB-INF/classes:res/build/WEB-INF/classes:lib/spring.jar:lib/hibernate3.jar:lib/c3p0-0.9.1.jar:$(build-classpath $required_jars)
 
 PACKAGES="installer mobile platform sac sis"
 
-for i in $PACKAGES
-do
-cd scalix-$i
-install -d build
-#%{__sed} -i s/com.sun.xml.messaging.saaj.soap.impl.TextImpl/com.sun.xml.internal.messaging.saaj.soap.impl.TextImpl/ caa/com/scalix/caa/soap/SOAPHelper.java
-%ant -Dbuild.sysclasspath=only
-cd -
+for i in $PACKAGES; do
+	cd scalix-$i
+	install -d build
+	#%{__sed} -i s/com.sun.xml.messaging.saaj.soap.impl.TextImpl/com.sun.xml.internal.messaging.saaj.soap.impl.TextImpl/ caa/com/scalix/caa/soap/SOAPHelper.java
+	%ant -Dbuild.sysclasspath=only
+	cd -
 done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT%{_datadir}/scalix
 install -d $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost
 
@@ -169,21 +171,21 @@
 
 %files mobile
 %defattr(644,root,root,755)
-%config(noreplace) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-mobile.xml
+%config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-mobile.xml
 %{_datadir}/scalix/scalix-mobile
 
 %files sac
 %defattr(644,root,root,755)
-%config(noreplace) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-caa-services.xml
-%config(noreplace) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-admin-console.xml
-%config(noreplace) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-res.xml
+%config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-caa-services.xml
+%config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-admin-console.xml
+%config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-res.xml
 %{_datadir}/scalix/caa-services
 %{_datadir}/scalix/scalix-admin-console
 %{_datadir}/scalix/scalix-res
 
 %files sis
 %defattr(644,root,root,755)
-%config(noreplace) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-sis.xml
+%config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-sis.xml
 %{_datadir}/scalix/scalix-sis
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -192,6 +194,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2009/04/01 10:20:26  glen
+- strict deps, %config flags, cosmetics
+
 Revision 1.26  2009/04/01 08:00:29  paszczus
 - better description
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/scalix.spec?r1=1.26&r2=1.27&f=u