[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jpackage-announce
Subject:    [JPackage-announce] [RPM (1.6)] webwork-2.1.7-1jpp
From:       jpackage () zarb ! org (Ralph Apel)
Date:       2005-09-23 15:05:51
Message-ID: 20050923130546.10970601A25 () ryu ! zarb ! org
[Download RAW message or body]

Name        : webwork                      Relocations: (not relocatable)
Version     : 2.1.7                             Vendor: JPackage Project
Release     : 1jpp                          Build Date: Fri 23 Sep 2005 02:14:45 PM \
CEST Install Date: (not installed)               Build Host: altair.localdomain
Group       : Development/Libraries/Java    Source RPM: (none)
Size        : 23069122      License: Apache Software License modified
Signature   : (none)
Packager    : Ralph Apel <r.apel@r-apel.de>
URL         : http://www.opensymphony.com/webwork/
Summary     : Web application framework for J2EE
Description :
WebWork is a Java web-application development framework.
It is built specifically with developer productivity and
code simplicity in mind. WebWork is built on top of XWork,
which provides a generic command pattern framework as well
as an Inversion of Control container. In addition to these
features, WebWork provides robust support for building
reusable UI templates, such as form controls, UI themes,
internationalization, dynamic form parameter mapping to
JavaBeans, robust client and server side validation,
and much more.

---------------
Ralph Apel <r.apel at r-apel.de> - 0:2.1.7-1jpp
- Update to 2.1.7
- Require jasperreports-1.0.0 
- Patch for jfreechart-0.9.21 and require it
- Patch for our pell-multipart
- One xwork/ognl related unit test failing
---------------
W: webwork invalid-license Apache Software License modified

---------------
Index: webwork-Script.patch
===================================================================
RCS file: /var/lib/cvs/jpackage/rpms/free/webwork/webwork-Script.patch,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 webwork-Script.patch
--- webwork-Script.patch	3 Mar 2004 06:35:49 -0000	1.1.2.1
+++ webwork-Script.patch	23 Sep 2005 13:05:43 -0000
@@ -1,25 +1,17 @@
-*** src/main/webwork/action/standard/Script.java.orig	2004-02-27 13:57:23.000000000 \
                -0500
---- src/main/webwork/action/standard/Script.java	2004-02-27 13:58:24.000000000 -0500
-***************
-*** 6,15 ****
-   */
-  package webwork.action.standard;
-  
-! import com.ibm.bsf.BSFEngine;
-! import com.ibm.bsf.BSFException;
-! import com.ibm.bsf.BSFManager;
-! import com.ibm.bsf.util.IOUtils;
-  import webwork.action.ActionSupport;
-  import webwork.action.ParameterAware;
-  
---- 6,15 ----
-   */
-  package webwork.action.standard;
-  
-! import org.apache.bsf.BSFEngine;
-! import org.apache.bsf.BSFException;
-! import org.apache.bsf.BSFManager;
-! import org.apache.bsf.util.IOUtils;
-  import webwork.action.ActionSupport;
-  import webwork.action.ParameterAware;
-  
+--- src/migration/webwork/action/standard/Script.java.sav	2004-12-14 \
14:51:12.000000000 +0100 ++++ \
src/migration/webwork/action/standard/Script.java	2005-09-22 13:33:07.000000000 +0200 \
+@@ -6,10 +6,10 @@ +  */
+ package webwork.action.standard;
+ 
+-import com.ibm.bsf.BSFEngine;
+-import com.ibm.bsf.BSFException;
+-import com.ibm.bsf.BSFManager;
+-import com.ibm.bsf.util.IOUtils;
++import org.apache.bsf.BSFEngine;
++import org.apache.bsf.BSFException;
++import org.apache.bsf.BSFManager;
++import org.apache.bsf.util.IOUtils;
+ import webwork.action.ActionSupport;
+ import webwork.action.ParameterAware;
+ 
Index: webwork-build_xml.patch
===================================================================
RCS file: /var/lib/cvs/jpackage/rpms/free/webwork/webwork-build_xml.patch,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 webwork-build_xml.patch
--- webwork-build_xml.patch	28 Jun 2004 17:34:27 -0000	1.1.2.1
+++ webwork-build_xml.patch	23 Sep 2005 13:05:43 -0000
@@ -1,38 +1,68 @@
---- build.xml.orig	2004-06-28 15:04:50.779419000 +0200
-+++ build.xml	2004-06-28 15:09:44.000000000 +0200
-@@ -107,11 +107,17 @@
-     <jar jarfile="${build.dir}/result/test-web/WEB-INF/lib/${name}.jar">
-       <fileset dir="${test.classes}">
-         <exclude name="**/examples/**"/>
-+        <exclude name="**/multipart/**"/>
-         <exclude name="*.properties"/>
-         <exclude name="*.xml"/>
-         <exclude name="**/*.html"/>
-       </fileset>
-     </jar>
-+    <jar jarfile="${build.dir}/result/test-web/WEB-INF/lib/${name}multipart.jar">
-+      <fileset dir="${test.classes}">
-+        <include name="**/multipart/*.class"/>
-+      </fileset>
-+    </jar>
-     <copy todir="${build.dir}/result/test-web/WEB-INF/lib" flatten="true">
-       <fileset dir="${lib.dir}">
-         <include name="**/clover*.jar"/>
-@@ -186,11 +192,17 @@
-     <jar jarfile="${build.dir}/result/web/WEB-INF/lib/${name}.jar">
-       <fileset dir="${build.dir}/result/web/WEB-INF/classes">
-         <exclude name="**/examples/**" />
-+        <exclude name="**/multipart/**" />
-         <exclude name="*.properties"/>
-         <exclude name="*.xml"/>
-         <exclude name="**/*.html"/>
-       </fileset>
-     </jar>
-+    <jar jarfile="${build.dir}/result/web/WEB-INF/lib/${name}multipart.jar">
-+      <fileset dir="${build.dir}/result/web/WEB-INF/classes">
-+        <include name="**/multipart/*.class"/>
-+      </fileset>
-+    </jar>
- 
-     <jar jarfile="${build.dir}/result/web/WEB-INF/lib/${name}-examples.jar">
-       <fileset dir="${build.dir}/result/web/WEB-INF/classes">
+--- build.xml.sav	2004-12-14 14:51:18.000000000 +0100
++++ build.xml	2005-09-22 16:58:25.000000000 +0200
+@@ -68,17 +68,8 @@
+     </target>
+ 
+     <target name="test" depends="java">
+-        <taskdef resource="clovertasks"/>
+         <taskdef name="junit" \
classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/> + 
+-        <mkdir dir="${build.clover}"/>
+-        <clover-setup initString="${build.clover}/coverage.db">
+-            <files>
+-                <exclude name="src/example/**/*.java"/>
+-                <exclude name="src/test/**/*.java"/>
+-            </files>
+-        </clover-setup>
+-
+         <mkdir dir="${build.test}"/>
+         <javac srcdir="${src.test}" destdir="${build.test}" \
classpath="${build.java}" classpathref="cp" debug="on"/> +         <copy \
filtering="no" todir="${build.test}"> +@@ -98,7 +89,8 @@
+         </copy>
+ 
+         <mkdir dir="${build.dist}/docs/junit"/>
+-        <junit printsummary="yes" haltonfailure="yes" haltonerror="yes" fork="yes">
++        <junit printsummary="yes" haltonfailure="no" haltonerror="yes" fork="yes" \
showoutput="true"> ++            <jvmarg value="-Djava.awt.headless=true"/>
+             <classpath>
+                 <pathelement location="${build.test}"/>
+                 <pathelement location="${build.java-test}"/>
+@@ -108,7 +100,7 @@
+             </classpath>
+ 
+             <formatter type="xml"/>
+-            <formatter type="brief" usefile="false"/>
++            <formatter type="plain"/>
+ 
+             <batchtest todir="${build.dist}/docs/junit">
+                 <fileset dir="${src.test}">
+@@ -142,7 +134,18 @@
+         <mkdir dir="${build.java}/META-INF"/>
+         <copy file="${src.etc}/taglib.tld" todir="${build.java}/META-INF"/>
+ 
+-        <jar basedir="${build.java}" jarfile="${build}/${name}-${version}.jar"/>
++        <jar jarfile="${build}/${name}-${version}.jar">
++          <fileset dir="${build.java}">
++            <exclude name="**/multipart/**"/>
++          </fileset>
++        </jar>
++
++        <jar jarfile="${build}/${name}-multipart-${version}.jar">
++          <fileset dir="${build.java}">
++            <include name="**/multipart/*.class"/>
++          </fileset>
++        </jar>
++
+     </target>
+ 
+     <target name="plugin">
+@@ -355,7 +358,7 @@
+         </junitreport>
+     </target>
+ 
+-    <target name="docs" depends="javadocs, clover.report, junit.report">
++    <target name="docs" depends="javadocs, junit.report">
+         <copy todir="${build.dist}/docs">
+             <fileset dir="${docs}"/>
+         </copy>
Index: webwork.spec
===================================================================
RCS file: /var/lib/cvs/jpackage/rpms/free/webwork/webwork.spec,v
retrieving revision 1.1.2.3.2.1
diff -u -r1.1.2.3.2.1 webwork.spec
--- webwork.spec	16 Feb 2005 21:49:19 -0000	1.1.2.3.2.1
+++ webwork.spec	23 Sep 2005 13:05:43 -0000
@@ -6,75 +6,99 @@
 
 Summary:        Web application framework for J2EE
 Name:           webwork
-Version:        1.4
-Release:        5jpp
+Version:        2.1.7
+Release:        1jpp
 Epoch:          0
-License:        Apache Software License
+License:        Apache Software License modified
 URL:            http://www.opensymphony.com/webwork/
 Group:          Development/Libraries/Java
 Vendor:         JPackage Project
 Distribution:   JPackage
-Source0:        webwork-1.4.tar.gz
-# cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/opensymphony login
-# cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/opensymphony export -r \
                release_1_4_0 webwork
-Patch0:         webwork-Script.patch
+Source0:        webwork-2.1.7.zip
+Source1:        webwork-LICENSE.txt
+Patch0:         webwork-2.1.7-PellMultiPartRequest.patch
 Patch1:         webwork-Multipart.patch
 Patch2:         webwork-build_xml.patch
-Patch3:         webwork-jasperreports.patch
-BuildRequires:  jpackage-utils >= 0:1.5
+Patch3:         webwork-Script.patch
+Patch4:         webwork-ChartResultTest.patch
+BuildRequires:  java-devel >= 0:1.4
+BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6
 BuildRequires:  ant-nodeps >= 0:1.6
-BuildRequires:  javacc
-BuildRequires:  jtidy 
-BuildRequires:  bsf 
-BuildRequires:  httpunit 
 BuildRequires:  junit >= 0:3.8.1
-BuildRequires:  servletapi4 
-BuildRequires:  xalan-j2 
-BuildRequires:  xerces-j2 
-BuildRequires:  jakarta-commons-logging 
-BuildRequires:  jdom 
+BuildRequires:	jsch
+BuildRequires:	mockobjects
+BuildRequires:	mockobjects-alt-jdk1.4
+BuildRequires:	mockobjects-jdk1.4
+BuildRequires:	mockobjects-jdk1.4-j2ee1.3
+#
 %if %{with_nonfree}
 BuildRequires:  cos-multipart >= 0:0.05Nov2002
 %endif
-BuildRequires:  rhino 
-BuildRequires:  pell-multipart
-BuildRequires:  jakarta-commons-beanutils
-BuildRequires:  jakarta-commons-collections
-BuildRequires:  jakarta-commons-digester
-BuildRequires:  itext
-BuildRequires:  jasperreports >= 0:0.6.4
-BuildRequires:  jakarta-poi
-BuildRequires:  log4j
-BuildRequires:  velocity
-Requires:  bsf
-Requires:  httpunit
-Requires:  servletapi4
-Requires:  xalan-j2
-Requires:  xerces-j2
-Requires:  jakarta-commons-logging
-Requires:  jdom
-Requires:  bsf
-Requires:  rhino
-Requires:  jakarta-commons-beanutils
-Requires:  jakarta-commons-collections
-Requires:  jakarta-commons-digester
-Requires:  itext
-Requires:  jasperreports >= 0:0.6.4
-Requires:  jakarta-poi
-Requires:  log4j
-Requires:  velocity
+BuildRequires:	bsf
+BuildRequires:	bsh
+BuildRequires:	freemarker
+BuildRequires:	itext
+BuildRequires:	jakarta-commons-beanutils
+BuildRequires:	jakarta-commons-collections
+BuildRequires:	jakarta-commons-digester
+BuildRequires:	jakarta-commons-fileupload
+BuildRequires:	jakarta-commons-lang
+BuildRequires:	jakarta-commons-logging
+BuildRequires:	jakarta-poi
+BuildRequires:	jakarta-taglibs-standard
+BuildRequires:  jasperreports >= 0:1.0.0
+BuildRequires:	javamail
+BuildRequires:	jcommon
+BuildRequires:  jfreechart >= 0:0.9.21
+BuildRequires:	log4j
+BuildRequires:	ognl
+BuildRequires:	oscore
+BuildRequires:	pell-multipart
+BuildRequires:	servletapi4
+BuildRequires:	velocity
+BuildRequires:	xml-commons-apis
+BuildRequires:	xwork
+Requires:	bsf
+Requires:	bsh
+Requires:	freemarker
+Requires:	itext
+Requires:	jakarta-commons-beanutils
+Requires:	jakarta-commons-collections
+Requires:	jakarta-commons-digester
+Requires:	jakarta-commons-fileupload
+Requires:	jakarta-commons-lang
+Requires:	jakarta-commons-logging
+Requires:	jakarta-poi
+Requires:	jakarta-taglibs-standard
+Requires:	jasperreports >= 0:1.0.0
+Requires:	javamail
+Requires:	jcommon
+Requires:	jfreechart >= 0:0.9.21
+Requires:	log4j
+Requires:	ognl
+Requires:	oscore
+Requires:	pell-multipart
+Requires:	servletapi4
+Requires:	velocity
+Requires:	xml-commons-apis
+Requires:	xwork
+
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
-WebWork is a web application framework for J2EE. 
-It is based on a concept called "Pull HMVC" Pull 
-Hierarchical Model View Controller). It supports 
-an arrange of view technologies - XSLT, JSP, 
-Velocity, Applet, Jasper Reports, and more.
-
+WebWork is a Java web-application development framework. 
+It is built specifically with developer productivity and 
+code simplicity in mind. WebWork is built on top of XWork, 
+which provides a generic command pattern framework as well 
+as an Inversion of Control container. In addition to these 
+features, WebWork provides robust support for building 
+reusable UI templates, such as form controls, UI themes, 
+internationalization, dynamic form parameter mapping to 
+JavaBeans, robust client and server side validation, 
+and much more. 
 
 %package multipart
 Summary:        Multipart support for %{name}
@@ -102,18 +126,19 @@
 %{summary}.
 
 %prep
-%setup -q -n %{name}
-find . -name "*.jar" -exec rm {} \;
+%setup -q -c -n %{name}
+for j in $(find . -name "*.jar"); do
+	mv $j $j.no
+done
 # Remove example with db4o, this lib is non-free, commercial only
 rm -rf src/main/webwork/examples/userreg
 # Remove cos-multipart implementation, pell-multipart will do it
 %if %{without_nonfree}
 rm src/main/webwork/multipart/CosMultiPartRequest.java
 %endif
-# Save MultiPartRequestWrapper, it may be patched to not accept cos
-cp src/main/webwork/multipart/MultiPartRequestWrapper.java \
                src/main/webwork/multipart/MultiPartRequestWrapper.java.sav
-# save original build.xml
-cp build.xml build.xml.sav
+cp src/example/log4j.properties src/test/log4j.properties
+# this test fails
+#rm src/test/com/opensymphony/webwork/interceptor/TokenSessionStoreInterceptorTest.java
  
 %patch0 -b .sav
 %if %{without_nonfree}
@@ -121,33 +146,69 @@
 %endif
 %patch2 -b .sav
 %patch3 -b .sav
+%patch4 -b .sav
 
 %build
 export OPT_JAR_LIST="ant/ant-nodeps ant/ant-junit junit"
-
-ln -s $(find-jar jtidy) lib/build/jtidy.jar
-ln -s $(find-jar bsf) lib/build/bsf.jar
-ln -s $(find-jar httpunit) lib/build/httpunit.jar
-#ln -s $(find-jar junit) lib/build/junit.jar
-ln -s $(find-jar servletapi4) lib/build/servlet.jar
-ln -s $(find-jar xalan-j2) lib/build/xalan.jar
-ln -s $(find-jar xerces-j2) lib/build/xerces.jar
-ln -s $(find-jar commons-logging) lib/core/commons-logging.jar
-ln -s $(find-jar jdom) lib/examples/jdom.jar
-ln -s $(find-jar bsf) lib/examples/bsf.jar
+pushd lib/build
+ln -sf $(build-classpath jsch) .
+ln -sf $(build-classpath junit) .
+ln -sf $(build-classpath mockobjects-j2ee1.3) .
+ln -sf $(build-classpath mockobjects-alt) .
+ln -sf $(build-classpath mockobjects) .
+ln -sf $(build-classpath mockobjects-core) .
+ln -sf $(build-classpath servletapi4) .
+ln -sf $(build-classpath xml-commons-apis) xml-apis.jar
+popd
+pushd lib/core
+ln -sf $(build-classpath commons-fileupload) .
+ln -sf $(build-classpath commons-logging) .
 %if %{with_nonfree}
-ln -s $(find-jar cos-multipart) lib/optional/cos-multipart.jar
+ln -sf $(build-classpath cos-multipart) .
 %endif
-ln -s $(find-jar rhino) lib/optional/js.jar
-ln -s $(find-jar pell-multipart) lib/optional/pell-multipart.jar
-ln -s $(find-jar commons-beanutils) lib/view/commons-beanutils.jar
-ln -s $(find-jar commons-collections) lib/view/commons-collections.jar
-ln -s $(find-jar commons-digester) lib/view/commons-digester.jar
-ln -s $(find-jar itext) lib/view/itext.jar
-ln -s $(find-jar jasperreports) lib/view/jasperreports.jar
-ln -s $(find-jar poi) lib/view/poi.jar
-ln -s $(find-jar log4j) lib/view/log4j.jar
-ln -s $(find-jar velocity) lib/view/velocity.jar
+ln -sf $(build-classpath javamail/mailapi) mail.jar
+ln -sf $(build-classpath ognl) .
+ln -sf $(build-classpath oscore) .
+ln -sf $(build-classpath pell-multipart) .
+ln -sf $(build-classpath velocity) .
+###BUILD/webwork/lib/core/velocity-dep.jar.no
+ln -sf $(build-classpath xwork) .
+popd
+pushd lib/example
+ln -sf $(build-classpath commons-beanutils) .
+ln -sf $(build-classpath commons-collections) .
+ln -sf $(build-classpath commons-lang) .
+#BUILD/webwork/lib/example/displaytag.jar.no
+#BUILD/webwork/lib/example/jstl.jar.no
+ln -sf $(build-classpath taglibs-core) jstl.jar
+ln -sf $(build-classpath taglibs-standard) standard.jar
+#BUILD/webwork/lib/example/taglibs-benchmark.jar.no
+popd
+pushd lib/migration
+ln -sf $(build-classpath bsf) .
+ln -sf $(build-classpath poi) jakarta-poi.jar
+popd
+pushd lib/optional
+ln -sf $(build-classpath bsh) .
+ln -sf $(build-classpath commons-beanutils) .
+ln -sf $(build-classpath commons-collections) .
+ln -sf $(build-classpath commons-digester) .
+ln -sf $(build-classpath freemarker) .
+ln -sf $(build-classpath itext) .
+ln -sf $(build-classpath poi) jakarta-poi.jar
+ln -sf $(build-classpath jasperreports) .
+ln -sf $(build-classpath jcommon) .
+ln -sf $(build-classpath jfreechart) .
+ln -sf $(build-classpath log4j) .
+#BUILD/webwork/lib/optional/log4j-1.2.8.jar.no
+popd
+#pushd lib/resin
+#BUILD/webwork/lib/resin/jmx.jar.no
+#BUILD/webwork/lib/resin/jsdk23.jar.no
+#BUILD/webwork/lib/resin/jta_101.jar.no
+#BUILD/webwork/lib/resin/resin.jar.no
+#popd
+
 
 ant -Dbuild.sysclasspath=first dist
 
@@ -156,26 +217,32 @@
 
 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/lib/%{name}.jar \
+
+cp -p build/%{name}-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-cp -p dist/lib/%{name}client.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-client-%{version}.jar
-cp -p dist/lib/%{name}multipart.jar \
+cp -p build/webflow-%{version}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/webflow-%{version}.jar
+cp -p build/%{name}-config-browser.jar \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-config-browser-%{version}.jar
+cp -p build/%{name}-migration.jar \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-migration-%{version}.jar
+cp -p build/%{name}-multipart-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-multipart-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} \
`echo $jar| sed "s|-%{version}||g"`; done)  mkdir -p \
                $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/etc
-cp dist/etc/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/etc
-cp dist/%{name}.war $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+cp build/webwork.tld $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/etc
+cp build/%{name}-example.war $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
 
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr build/dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-rm -rf dist/docs/api
+rm -rf build/dist/docs/api
 
 # manual
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -pr dist/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -pr build/dist/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/LICENSE.txt
 
 
 %clean
@@ -192,29 +259,38 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc %{_docdir}/%{name}-%{version}/license.txt
+%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
 %{_datadir}/%{name}-%{version}
+%{_javadir}/*.jar
 %{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-client-%{version}.jar
-%{_javadir}/%{name}-client.jar
+%{_javadir}/webflow*.jar
+%{_javadir}/%{name}-config-browser*.jar
+%{_javadir}/%{name}-migration*.jar
 
 %files multipart
 %defattr(0644,root,root,0755)
-%{_javadir}/%{name}-multipart-%{version}.jar
-%{_javadir}/%{name}-multipart.jar
+%{_javadir}/%{name}-multipart*.jar
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%doc %{_javadocdir}
+%doc %{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
 %files manual
 %defattr(0644,root,root,0755)
-%doc %{_docdir}
+%doc %{_docdir}/%{name}-%{version}
 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Sep 21 2005 Ralph Apel <r.apel at r-apel.de> - 0:2.1.7-1jpp
+- Update to 2.1.7
+- Require jasperreports-1.0.0 
+- Patch for jfreechart-0.9.21 and require it
+- Patch for our pell-multipart
+- One xwork/ognl related unit test failing
+
 * Wed Feb 16 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.4-5jpp
 - Patch for jasperreports-0.6.4 and require it
 


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic