rpms/checkstyle/F-8 checkstyle-4.1-build.patch, 1.1, 1.2 checkstyle.spec, 1.1, 1.2

[Deepak Bhole (dbhole)]

Author: dbhole

Update of /cvs/pkgs/rpms/checkstyle/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8847

Modified Files:
	checkstyle-4.1-build.patch checkstyle.spec 
Log Message:

- Resolve bz#332801. Remove java < 1.5.0 requirement
- Set failonerror=false for xdoc generation, due to a sinjdoc problems



checkstyle-4.1-build.patch:

Index: checkstyle-4.1-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/checkstyle/F-8/checkstyle-4.1-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- checkstyle-4.1-build.patch	14 Mar 2007 01:33:46 -0000	1.1
+++ checkstyle-4.1-build.patch	22 Oct 2007 18:07:50 -0000	1.2
@@ -1,5 +1,6 @@
+diff -up ./build.xml.sav ./build.xml
 --- ./build.xml.sav	2005-12-15 06:57:02.000000000 -0500
-+++ ./build.xml	2007-02-14 22:13:25.000000000 -0500
++++ ./build.xml	2007-10-22 13:49:43.000000000 -0400
 @@ -20,7 +20,7 @@
    <property name="cli.jar" value="lib/commons-cli.jar" />
    <property name="logging.jar" value="lib/commons-logging.jar" />
@@ -31,7 +32,16 @@
  
      <copy todir="${checkstyle.dest}">
        <fileset dir="src/checkstyle" includes="**/*.properties"/>
-@@ -584,7 +586,7 @@
+@@ -176,7 +178,7 @@
+              classpathref="javadoc.classpath"
+              encoding="iso-8859-1"
+              source="${checkstyle.minimum.javaversion}"
+-             failonerror="yes">
++             failonerror="no">
+       <doclet name="com.puppycrawl.tools.checkstyle.doclets.TokenTypesDoclet"
+               path="${checkstyle.dest}">
+         <param name="-destfile" value="${checkstyle.dest}/com/puppycrawl/tools/checkstyle/api/tokentypes.properties"/>
+@@ -584,7 +586,7 @@ For users of JDK 1.5 at least version 1.
               Windowtitle="Checkstyle API"
               classpathref="javadoc.classpath"
               Use="true"
@@ -40,7 +50,7 @@
               useExternalFile="yes"
               encoding="iso-8859-1"
               source="${checkstyle.minimum.javaversion}"
-@@ -605,6 +607,7 @@
+@@ -605,6 +607,7 @@ For users of JDK 1.5 at least version 1.
          <exclude name="**/*.dtd" />
          <exclude name="**/*.xml" />
          <exclude name="**/*.html" />
@@ -48,7 +58,16 @@
        </fileset>
      </javadoc>
    </target>
-@@ -652,6 +655,7 @@
+@@ -630,7 +633,7 @@ For users of JDK 1.5 at least version 1.
+     <javadoc sourcepath="src/checkstyle" destdir="${target.dir}/xdocs"
+              classpathref="build.classpath"
+              source="${checkstyle.minimum.javaversion}"
+-             failonerror="yes">
++             failonerror="no">
+       <doclet name="com.puppycrawl.tools.checkstyle.doclets.CheckDocsDoclet"
+               path="${checkstyle.dest}">
+       </doclet>
+@@ -652,6 +655,7 @@ For users of JDK 1.5 at least version 1.
        </fileset>
      </copy>
  
@@ -56,7 +75,7 @@
      <anakia basedir="${target.dir}/xdocs"
              destdir="${xdocs.dest}/"
              extension=".html"
-@@ -662,7 +666,7 @@
+@@ -662,7 +666,7 @@ For users of JDK 1.5 at least version 1.
              lastModifiedCheck="true"
              templatePath="${xdocs.src}/stylesheets">
      </anakia>


Index: checkstyle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/checkstyle/F-8/checkstyle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- checkstyle.spec	14 Mar 2007 01:33:46 -0000	1.1
+++ checkstyle.spec	22 Oct 2007 18:07:50 -0000	1.2
@@ -30,7 +30,7 @@
 
 Name:           checkstyle
 Version:        4.1
-Release:        4jpp.1%{?dist}
+Release:        4jpp.2%{?dist}
 Epoch:          0
 Summary:        Java source code checker
 License:        LGPL
@@ -64,7 +64,6 @@
 Requires:       jaxp_parser_impl
 BuildRequires:  ant >= 0:1.6, ant-nodeps >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6, junit, antlr >= 0:2.7.1
-BuildRequires:  java-devel < 0:1.5.0
 BuildRequires:  jakarta-commons-beanutils
 BuildRequires:  jakarta-commons-cli, xalan-j2, jpackage-utils >= 0:1.5
 BuildRequires:  jakarta-commons-logging, jakarta-commons-collections, xerces-j2
@@ -251,7 +250,7 @@
 popd
 
 %build
-export JAVA_HOME=/usr/lib/jvm/java-1.4.2
+export JAVA_HOME=/usr/lib/jvm/java
 export OPT_JAR_LIST="ant/ant-junit junit ant/ant-nodeps jdom velocity"
 export CLASSPATH=$(build-classpath commons-collections)
 
@@ -383,6 +382,10 @@
 %{_javadir}/%{name}-optional-%{version}.jar
 
 %changelog
+* Mon Oct 22 2007 Deepak Bhole <dbhole at redhat.com> - 0:4.1-4jpp.2
+- Resolve bz#332801. Remove java < 1.5.0 requirement
+- Set failonerror=false for xdoc generation, due to a sinjdoc problems
+
 * Thu Feb 24 2007 Deepak Bhole <dbhole at redhat.com> - 0:4.1-4jpp.1
 - Update per Fedora spec
 - Removed emma and excalibur-avalon-logkit dependencies