rpms/struts11/devel struts11.spec,1.8,1.9

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/struts11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26486

Modified Files:
	struts11.spec 
Log Message:
Embed struts-legacy classes in main jarfile


Index: struts11.spec
===================================================================
RCS file: /cvs/dist/rpms/struts11/devel/struts11.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- struts11.spec	9 May 2005 16:41:06 -0000	1.8
+++ struts11.spec	10 May 2005 10:35:50 -0000	1.9
@@ -2,7 +2,7 @@
 %define name		struts11
 %define full_name	jakarta-%{unvname}
 %define version		1.1
-%define release		1jpp_6fc
+%define release		1jpp_7fc
 %define tomcat3appsdir	%{_localstatedir}/tomcat3/webapps
 %define tomcat4appsdir	%{_localstatedir}/lib/tomcat4/webapps
 %define tomcat5appsdir	%{_localstatedir}/lib/tomcat5/webapps
@@ -169,6 +169,14 @@
 	-Dstruts-legacy.jar=./struts-legacy-%{legacyver}-src/dist/struts-legacy.jar \
 	 compile.library compile.webapps compile.javadoc
 
+# embed struts-legacy in the main jarfile
+mkdir target/library/tmp
+pushd target/library/tmp
+jar xf ../struts-legacy.jar
+jar uf ../struts.jar org
+popd
+rm -rf target/library/tmp
+
 aot-compile \
     target/library/%{unvname}.jar \
     lib%{unvname}-%{version}.jar.so \
@@ -477,6 +485,9 @@
 
 
 %changelog
+* Tue May 10 2005 Gary Benson <gbenson at redhat.com> - 0:1.1-1jpp_7fc
+- Embed struts-legacy classes in main jarfile.
+
 * Mon May  9 2005 Gary Benson <gbenson at redhat.com> - 0:1.1-1jpp_6fc
 - Work around a classloader issue (#157205).