SPECS: jakarta-struts.spec - some fixes in %%install - disabled -doc subpac...

[pawelz]

Author: pawelz                       Date: Thu Dec 25 23:52:53 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- some fixes in %%install
- disabled -doc subpackage

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

---- Diffs:

================================================================
Index: SPECS/jakarta-struts.spec
diff -u SPECS/jakarta-struts.spec:1.16 SPECS/jakarta-struts.spec:1.17
--- SPECS/jakarta-struts.spec:1.16	Fri Dec 26 00:13:17 2008
+++ SPECS/jakarta-struts.spec	Fri Dec 26 00:52:48 2008
@@ -164,14 +164,18 @@
 install -d $RPM_BUILD_ROOT%{tomcatappsdir}
 for webapp in %{webapps}; do
 	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
-		FILE=`basename $tld`
-		FROM=%{_datadir}/%{name}/$FILE
-		TO=$RPM_BUILD_ROOT%{tomcatappsdir}/%{name}-$webapp/WEB-INF/$FILE
-		ln -sf $FROM $TO
+	cd $RPM_BUILD_ROOT%{tomcatappsdir}/%{name}-$webapp/WEB-INF/lib
+	for jarfile in struts*.jar; do
+	  ln -sf %{_javadir}/$jarfile $jarfile
 	done
+	cd -
+
+	# for tld in $RPM_BUILD_ROOT%{_datadir}/%{name}/*.tld; do
+	# 	FILE=`basename $tld`
+	# 	FROM=%{_datadir}/%{name}/$FILE
+	# 	TO=$RPM_BUILD_ROOT%{tomcatappsdir}/%{name}-$webapp/WEB-INF/$FILE
+	# 	ln -sf $FROM $TO
+	# done
 done
 
 %clean
@@ -179,10 +183,10 @@
 
 %files
 %defattr(644,root,root,755)
-%doc INSTALL LICENSE.txt README STATUS.txt
-%{_javadir}/*.jar
-%{_datadir}/%{name}
+%doc LICENSE.txt NOTICE.txt
+%{_javadir}/struts-*.jar
 
+%if 0
 %files doc
 %defattr(644,root,root,755)
 %doc target/documentation/*.html
@@ -191,6 +195,7 @@
 %doc target/documentation/userGuide
 %doc target/documentation/images
 %doc target/documentation/api
+%endif
 
 %files webapps
 # XXX: this defattr is EVIL, is global http:http really needed???
@@ -258,6 +263,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2008/12/25 23:52:48  pawelz
+- some fixes in %%install
+- disabled -doc subpackage
+
 Revision 1.16  2008/12/25 23:13:17  pawelz
 - up to 1.3.10
 - build example webapps
================================================================

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