rpms/jonas/devel jonas.spec,1.95,1.96

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/jonas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14522

Modified Files:
	jonas.spec 
Log Message:
Try again...


Index: jonas.spec
===================================================================
RCS file: /cvs/dist/rpms/jonas/devel/jonas.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- jonas.spec	27 Jul 2005 14:19:00 -0000	1.95
+++ jonas.spec	27 Jul 2005 15:19:17 -0000	1.96
@@ -658,7 +658,6 @@
 popd
 pushd externals/tools
 	find . -name "*.jar" \
-               -not -name "ews*.jar" \
                -not -name "xbean-apache*.jar" \
                -exec rm -f {} \;
 	# externals/tools/velocity-dep-1.4.jar includes also
@@ -670,6 +669,7 @@
 	build-jar-repository . commons-digester axis/axis-ant \
 	    carol/ow_carol_cmic monolog/ow_util_log_wrp_velo velocity oro \
 	    hsqldb jorm/ow_jorm_compiler
+	cp -a %{SOURCE15} .
 popd
 
 # FIXME Someone is getting confused with the brackets in the war
@@ -929,10 +929,10 @@
 pushd $RPM_BUILD_ROOT%{libdir}/tools
 	find . -name "*.jar" \
                -not -name "ow_jonas*.jar" \
-               -not -name "ow_jorm_compiler*.jar" \
+               -not -name "ews*.jar" \
                -not -name "xbean-apache*.jar" \
                -exec rm -f {} \;
-	cp -a %{SOURCE15} .
+	build-jar-repository . jorm/ow_jorm_compiler
 popd
 
 pushd $RPM_BUILD_ROOT%{libdir}/examples