SPECS: jakarta-struts.spec - up to 1.3.10 - build example webapps - build a...

[pawelz]

Author: pawelz                       Date: Thu Dec 25 23:13:22 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.3.10
- build example webapps
- build all example webapps
- NFY: %%installs, %%files section fails

---- Files affected:
SPECS:
   jakarta-struts.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/jakarta-struts.spec
diff -u SPECS/jakarta-struts.spec:1.15 SPECS/jakarta-struts.spec:1.16
--- SPECS/jakarta-struts.spec:1.15	Thu May 31 10:37:50 2007
+++ SPECS/jakarta-struts.spec	Fri Dec 26 00:13:17 2008
@@ -2,12 +2,12 @@
 Summary:	Web application framework
 Summary(pl.UTF-8):	Szkielet dla aplikacji WWW
 Name:		jakarta-struts
-Version:	1.3.8
+Version:	1.3.10
 Release:	0.1
 License:	Apache v2.0
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/struts/source/struts-%{version}-src.zip
-# Source0-md5:	44b143605e664dd041b9294aa683af6a
+# Source0-md5:	7fb96adbc2b18ddd80462294cafb944d
 Patch0:		%{name}-build.patch
 URL:		http://struts.apache.org/
 #BuildRequires:	ant >= 1.6
@@ -42,7 +42,7 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define 	tomcatappsdir	%{_libdir}/tomcat/webapps
-%define 	webapps		blank example examples
+%define 	webapps		blank cookbook el-example examples faces-example1 faces-example2 mailreader scripting-mailreader
 
 %description
 Welcome to the Struts Framework! The goal of this project is to
@@ -110,7 +110,7 @@
 %setup -q -n struts-%{version}
 
 %build
-%define	mvn mvn --settings settings.xml
+%define	mvn mvn --settings $RPM_BUILD_DIR/settings.xml
 cd src
 
 export JAVA_HOME="%{java_home}"
@@ -124,6 +124,9 @@
 %mvn install:install-file -DgroupId=bsf -DartifactId=bsf -Dpackaging=jar -Dfile=$(build-classpath bsf) -Dversion=2.3.0
 %mvn package
 
+cd apps
+%mvn
+
 %if 0
 required_jars="
 antlr commons-beanutils commons-collections commons-digester commons-fileupload
@@ -155,12 +158,12 @@
 done
 
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp target/library/*.tld $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp target/library/*.dtd $RPM_BUILD_ROOT%{_datadir}/%{name}
+# cp target/library/*.tld $RPM_BUILD_ROOT%{_datadir}/%{name}
+# cp target/library/*.dtd $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 install -d $RPM_BUILD_ROOT%{tomcatappsdir}
 for webapp in %{webapps}; do
-	cp -pr target/$webapp $RPM_BUILD_ROOT%{tomcatappsdir}/%{name}-$webapp
+	cp -pr apps/$webapp/target/struts-$webapp $RPM_BUILD_ROOT%{tomcatappsdir}/%{name}-$webapp
 	ln -sf %{_javadir}/struts.jar $RPM_BUILD_ROOT%{tomcatappsdir}/%{name}-$webapp/WEB-INF/lib/struts.jar
 
 	for tld in $RPM_BUILD_ROOT%{_datadir}/%{name}/*.tld; do
@@ -255,6 +258,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2008/12/25 23:13:17  pawelz
+- up to 1.3.10
+- build example webapps
+- build all example webapps
+- NFY: %%installs, %%files section fails
+
 Revision 1.15  2007/05/31 08:37:50  glen
 - 1.3.8, commit what i have
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jakarta-struts.spec?r1=1.15&r2=1.16&f=u