rpms/xdoclet/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xdoclet-ant.not-required.patch, 1.3, 1.4 xdoclet.spec, 1.28, 1.29

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Apr 26 00:09:24 UTC 2007 

Author: mwringe

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14046

Modified Files:
	.cvsignore sources xdoclet-ant.not-required.patch xdoclet.spec 
Log Message:
- Merge with newest jpp version
- Fix some rpm lint warnings



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Jul 2006 04:26:35 -0000	1.5
+++ .cvsignore	26 Apr 2007 00:09:22 -0000	1.6
@@ -1,2 +1,2 @@
-xdoclet-src-1.2.3-RHCLEAN.tgz
+xdoclet-src-1.2.3.tgz
 xdoclet-modules-objectweb-4.6.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jul 2006 04:26:35 -0000	1.5
+++ sources	26 Apr 2007 00:09:22 -0000	1.6
@@ -1,2 +1,2 @@
-cd3e46f6470bba5f786e0d5555e252f8  xdoclet-src-1.2.3-RHCLEAN.tgz
+9e1a2856e03b338b505a086b962a77ab  xdoclet-src-1.2.3.tgz
 a4bf2dddfcc204f538dfc633f0aeed30  xdoclet-modules-objectweb-4.6.tgz

xdoclet-ant.not-required.patch:
 core/src/xdoclet/TemplateSubTask.java                                        |    8 ++++----
 core/src/xdoclet/XmlSubTask.java                                             |    4 ++--
 modules/apache/src/xdoclet/modules/apache/struts/StrutsConfigXmlSubTask.java |    2 +-
 modules/ejb/src/xdoclet/modules/ejb/EjbDocletTask.java                       |    4 ++--
 modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectSubTask.java            |    2 +-
 modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectSubTask.java           |    2 +-
 modules/hibernate/src/xdoclet/modules/hibernate/HibernateSubTask.java        |    2 +-
 modules/hp/src/xdoclet/modules/hp/hpas/ejb/HPASSubTask.java                  |   10 +++++-----
 modules/libelis/src/xdoclet/modules/libelis/jdo/LidoSubTask.java             |    2 +-
 modules/mvcsoft/src/xdoclet/modules/mvcsoft/ejb/MVCSoftSubTask.java          |    4 ++--
 modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java     |    2 +-
 modules/sun/src/xdoclet/modules/sun/sunone/ejb/SunONESubTask.java            |    6 +++---
 modules/tjdo/src/xdoclet/modules/triactive/jdo/TJDOSubTask.java              |    2 +-
 13 files changed, 25 insertions(+), 25 deletions(-)

Index: xdoclet-ant.not-required.patch
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet-ant.not-required.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xdoclet-ant.not-required.patch	23 Jul 2006 05:33:03 -0000	1.3
+++ xdoclet-ant.not-required.patch	26 Apr 2007 00:09:22 -0000	1.4
@@ -191,28 +191,6 @@
       */
      public void setLoggingtype(String loggingType)
      {
---- modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/JonasSubTask.java.orig	2004-06-30 20:49:02.000000000 +0200
-+++ modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/JonasSubTask.java	2004-06-30 20:39:18.000000000 +0200
-@@ -228,7 +228,7 @@
-      * Sets the version of JOnAS. Supported versions are: 2.3, 2.4, 2.5, 2.6, 3.0, 3.2, 3.3.2, 4.0, 4.2, 4.6
-      *
-      * @param version      The new version value. Supported versions are: 2.3, 2.4, 2.5, 2.6, 3.0, 3.2, 3.3.2, 4.0, 4.2, 4.6
--     * @ant.not-required   No, default is "2.6".
-+     * @ant.not-required   "No, default is '2.6'."
-      */
-     public void setVersion(JonasVersionTypes version)
-     {
---- modules/objectweb/src/xdoclet/modules/objectweb/jonas/web/JonasWebSubTask.java.orig	2004-06-30 20:49:02.000000000 +0200
-+++ modules/objectweb/src/xdoclet/modules/objectweb/jonas/web/JonasWebSubTask.java	2004-06-30 20:39:43.000000000 +0200
-@@ -127,7 +127,7 @@
-      * Sets the version of JOnAS. Supported versions are: 2.6.
-      *
-      * @param version      The new version value. Supported versions are: 2.6.
--     * @ant.not-required   No, default is "2.6".
-+     * @ant.not-required   "No, default is '2.6'."
-      */
-     public void setVersion(JonasVersionTypes version)
-     {
 --- modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java.orig	2004-06-30 20:49:02.000000000 +0200
 +++ modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java	2004-06-30 20:40:02.000000000 +0200
 @@ -63,7 +63,7 @@


Index: xdoclet.spec
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xdoclet.spec	11 Apr 2007 13:26:59 -0000	1.28
+++ xdoclet.spec	26 Apr 2007 00:09:22 -0000	1.29
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29,45 +29,52 @@
 #
 
 %define _with_gcj_support 1
+%define _without_maven 1
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define section free
+# If you don't want to build with maven, and use straight ant instead,
+# give rpmbuild option '--without maven'
+%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
+%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
 
-# FIXME: JPP 1.7 lacks webwork and xwork, needed for the demo
+# FIXME: Fedora lacks webwork and xwork, needed for the demo
 %define _without_demo 1
 
 # If you do not want to build samples in demo subpackage because of their 
 # runtime deps, give rpmbuild option '--without demo'
 %define with_demo %{!?_without_demo:1}%{?_without_demo:0}
 
-Name:		xdoclet
-Version:	1.2.3
-Release:	7jpp.3
-Epoch:		0
-Summary:	XDoclet Attribute Orientated Programming Framework
-License:	XDoclet Open Source Licence
-Group:		Development/Framework
-URL:		http://xdoclet.sourceforge.net
-Source0:	%{name}-src-%{version}-RHCLEAN.tgz
-Source1:	%{name}-modules-objectweb-4.6.tgz
-Patch0:		xdoclet-build_xml.patch
-Patch1:		xdoclet-XDocletModulesEjbMessages.patch
-Patch2:		xdoclet-ant.not-required.patch
-Patch3:		xdoclet-WebLogicSubTask.patch
-Patch4:		xdoclet-project_xml.patch
-Patch5:		xdoclet-AbstractProgramElementTagsHandler.patch
-Patch6:		xdoclet-build_docs_xml.patch
+Name:           xdoclet
+Version:        1.2.3
+Release:        8jpp.1%{?dist}
+Epoch:          0
+Summary:        XDoclet Attribute Orientated Programming Framework
+License:        BSD Style       
+Group:          Development/Framework
+URL:            http://xdoclet.sourceforge.net
+Source0:        http://superb-east.dl.sourceforge.net/sourceforge/xdoclet/xdoclet-src-1.2.3.tgz 
+#Source1:        %{name}-modules-objectweb-4.6.tgz
+Patch0:         xdoclet-build_xml.patch
+Patch1:         xdoclet-XDocletModulesEjbMessages.patch
+Patch2:         xdoclet-ant.not-required.patch
+Patch3:         xdoclet-WebLogicSubTask.patch
+Patch4:         xdoclet-project_xml.patch
+Patch5:         xdoclet-AbstractProgramElementTagsHandler.patch
+Patch6:         xdoclet-build_docs_xml.patch
 
 %if ! %{gcj_support}
-BuildArch:	noarch
+BuildArch:      noarch
 %endif
-BuildRoot: 	%{_tmppath}/%{name}-root
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  java-devel >= 0:1.4.2
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-nodeps >= 0:1.5
-BuildRequires:	ant-trax
+BuildRequires:  ant-trax
+%if %{with_maven}
+BuildRequires:  maven >= 0:1.1
+%endif
 BuildRequires:  junit
 BuildRequires:  javacc
 BuildRequires:  jrefactory
@@ -75,6 +82,7 @@
 BuildRequires:  jakarta-commons-collections 
 BuildRequires:  jakarta-commons-lang 
 BuildRequires:  jakarta-commons-logging 
+#BuildRequires:  jakarta-commons-net 
 BuildRequires:  log4j
 BuildRequires:  struts 
 BuildRequires:  velocity 
@@ -92,9 +100,9 @@
 Requires:  xjavadoc = 0:1.1
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
 %endif
 
 %description
@@ -102,8 +110,8 @@
 
 %if %{with_demo}
 %package demo
-Summary:	XDoclet Sample Projects
-Group:		Development/Framework
+Summary:        XDoclet Sample Projects
+Group:          Development/Framework
 BuildRequires:  servletapi4
 BuildRequires:  struts
 BuildRequires:  velocity
@@ -127,64 +135,76 @@
 This package contains sample XDoclet projects.
 %endif
 
+%if %{with_maven}
+%package maven-plugin
+Summary:        XDoclet Maven Plugin
+Group:          Development/Framework
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       maven >= 0:1.1
+
+%description maven-plugin
+%{summary}.
+%endif
+
 %package javadoc
-Summary:	XDoclet Javadoc
-Group:		Development/Documentation
-Requires(post): /bin/rm /bin/ln
-Requires(postun): /bin/rm
+Summary:        XDoclet Javadoc
+Group:          Development/Documentation
 
 %description javadoc
 This package contains XDoclet javadoc
 
 %package manual
-Summary:	XDoclet Sample Manuals and Documentation
-Group:		Development/Documentation
+Summary:        XDoclet Sample Manuals and Documentation
+Group:          Development/Documentation
 
 %description manual
 This package contains XDoclet documentation.
 
 %prep
 %setup -q
-#find . -name "*.jar" -exec rm {} \;
-for j in $(find . -name "*.jar"); do
-    mv $j $j.no
-done
+# Remove binary information in the source tar
+find . -name "*.jar" -exec rm {} \;
+find . -name "*.class" -exec rm {} \;
 
 # Replace JOnAS specific tasks with code blessed by ObjectWeb
-pushd modules
-mv objectweb objectweb.orig
-tar xzf %{SOURCE1}
-popd
+#pushd modules
+#mv objectweb objectweb.orig
+#tar xzf %{SOURCE1}
+#popd
 
 # Remove mockobjects support.
 rm -rf modules/mockobjects
 
 for j in xjavadoc-1.1 jrefactory javacc junit bsf commons-collections commons-logging log4j velocity xalan-j2 xjavadoc xml-commons-apis; do
-	ln -s $(build-classpath $j) lib
+        ln -s $(build-classpath $j) lib
 done
 
 %if %{with_demo}
 for j in servletapi4 struts velocity webwork-migration xwork geronimo-ejb-2.1-api myfaces/myfaces-jsf-api geronimo-jms-1.1-api; do
-	ln -s $(build-classpath $j) samples/lib
+        ln -s $(build-classpath $j) samples/lib
 done
 for j in mx4j/mx4j-jmx mx4j/mx4j-tools; do
         i=$(build-classpath $j)
-	ln -s $(build-classpath $j) samples/lib
+        ln -s $(build-classpath $j) samples/lib
 done
 %endif
 
 %patch0 -b .sav
 %patch1 -b .sav
-%patch2
+%patch2 
 %patch3 -b .sav
 %patch4 -b .sav
 %patch5 -b .sav
 %patch6 -b .sav
 
 %build
-export OPT_JAR_LIST="ant/ant-nodeps jrefactory jaxp_transform_impl ant/ant-trax"
-ant xjavadoc core modules docs l10n
-
+export MAVEN_HOME=/usr/share/maven
+export MAVEN_LOCAL_HOME=$(pwd)/.maven
+%if %{with_maven}
+ant -Dbuild.sysclasspath=first core modules maven docs l10n
+%else
+ant -Dbuild.sysclasspath=first core modules docs l10n
+%endif
 %if %{with_demo}
 ant samples
 %endif
@@ -193,6 +213,9 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
 install -m 644 target/lib/xdoclet*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
+%if %{with_maven}
+install -m 644 target/lib/maven-xdoclet*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
+%endif
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
 %if %{with_demo}
@@ -207,34 +230,25 @@
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -p LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
 
 %if %{gcj_support}
-%{_bindir}/aot-compile-rpm
+%{_bindir}/aot-compile-rpm 
 %endif
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
-fi
-
-%post
 %if %{gcj_support}
+%post
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
 %endif
 
-%postun
 %if %{gcj_support}
+%postun
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
@@ -243,10 +257,12 @@
 
 %files
 %defattr(-, root, root, -)
-%{_javadir}/%{name}
-#%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/%{name}*.jar
+%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
 
 %if %{gcj_support}
+%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-1.2.3.jar.*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-apache-module-1.2.3.jar.*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-bea-module-1.2.3.jar.*
@@ -283,6 +299,12 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-xdoclet-module-1.2.3.jar.*
 %endif
 
+%if %{with_maven}
+%files maven-plugin
+%defattr(-, root, root, -)
+%{_javadir}/%{name}/maven-%{name}*.jar
+%endif
+
 %if %{with_demo}
 %files demo
 %defattr(-, root, root, -)
@@ -292,16 +314,27 @@
 %files javadoc
 %defattr(-, root, root, -)
 %doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}
 
 %files manual
 %defattr(-, root, root, -)
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Wed Apr 25 2007 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-8jpp.1
+- Merge with newest jpp version
+- Fix some rpm lint warnings
+
 * Tue Apr 11 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.2.3-7jpp.3
 - Remove mockobjects requirements.
 
+* Wed Mar 07 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2.3-8jpp
+- Optionally build without maven
+- Separate out maven-xdoclet-plugin into own subpackage
+- Reactivate demo, now that webwork and xwork are available
+- No native xdoclet-maven-plugin
+
+
 * Fri Aug 04 2006 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-7jpp.2
 - Rebuild with define with_gcj_support
 
@@ -328,7 +361,7 @@
 * Sat Jul 22 2006 Matt Wringe <mringe at redhat.com> - 0:1.2.3-6jpp
 - Add conditional native compiling
 - Add missing buildrequires: ant-nodeps and ant-trax
-- Add missing javadoc %ghost symlink
+- Add missing javadoc %%ghost symlink
 
 * Thu Jun 08 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.2.3-5jpp
 - Update objectweb module to match JOnAS 4.6.x

More information about the fedora-cvs-commits mailing list