rpms/pmd/devel pmd-4.2.4-nicerhtml.patch, 1.1, 1.2 pmd-4.2.5-build.patch, 1.1, 1.2 pmd.spec, 1.11, 1.12
Jerry James
jjames at fedoraproject.org
Wed Jun 2 15:40:21 UTC 2010
Author: jjames
Update of /cvs/pkgs/rpms/pmd/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8330/devel
Modified Files:
pmd-4.2.4-nicerhtml.patch pmd-4.2.5-build.patch pmd.spec
Log Message:
* Wed Jun 2 2010 Jerry James <loganjerry at gmail.com> - 0:4.2.5-6
- Update objectweb-asm dependency for version 3.2.
pmd-4.2.4-nicerhtml.patch:
XSLTRenderer.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
Index: pmd-4.2.4-nicerhtml.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pmd/devel/pmd-4.2.4-nicerhtml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pmd-4.2.4-nicerhtml.patch 14 Jan 2009 23:39:06 -0000 1.1
+++ pmd-4.2.4-nicerhtml.patch 2 Jun 2010 15:40:20 -0000 1.2
@@ -1,6 +1,5 @@
-diff -dur pmd-4.2.4.ORIG/src/net/sourceforge/pmd/renderers/XSLTRenderer.java pmd-4.2.4/src/net/sourceforge/pmd/renderers/XSLTRenderer.java
---- pmd-4.2.4.ORIG/src/net/sourceforge/pmd/renderers/XSLTRenderer.java 2007-10-19 13:21:30.000000000 -0600
-+++ pmd-4.2.4/src/net/sourceforge/pmd/renderers/XSLTRenderer.java 2009-01-14 16:16:48.000000000 -0700
+--- src/net/sourceforge/pmd/renderers/XSLTRenderer.java.orig 2007-10-19 13:21:30.000000000 -0600
++++ src/net/sourceforge/pmd/renderers/XSLTRenderer.java 2010-06-02 09:14:03.722935341 -0600
@@ -45,9 +45,11 @@
* @param xsltFilename
*/
pmd-4.2.5-build.patch:
build.xml | 111 ++++++--------------------------------------------------------
1 file changed, 12 insertions(+), 99 deletions(-)
Index: pmd-4.2.5-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pmd/devel/pmd-4.2.5-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pmd-4.2.5-build.patch 11 Feb 2009 19:47:53 -0000 1.1
+++ pmd-4.2.5-build.patch 2 Jun 2010 15:40:21 -0000 1.2
@@ -1,11 +1,15 @@
-diff -dur pmd-4.2.5.ORIG/bin/build.xml pmd-4.2.5/bin/build.xml
---- pmd-4.2.5.ORIG/bin/build.xml 2009-01-27 13:24:02.000000000 -0700
-+++ pmd-4.2.5/bin/build.xml 2009-02-11 12:29:52.000000000 -0700
-@@ -15,7 +15,6 @@
- <property name="asm.version" value="3.1" />
+--- bin/build.xml.orig 2009-01-27 13:24:02.000000000 -0700
++++ bin/build.xml 2010-06-02 09:32:41.472666527 -0600
+@@ -12,10 +12,9 @@
+ <property name="dir.regress" value="regress/" />
+ <property name="version" value="4.2.5" />
+
+- <property name="asm.version" value="3.1" />
++ <property name="asm.version" value="3.2" />
<property name="jaxen.version" value="1.1.1" />
- <property name="junit.version" value="4.4" />
+- <property name="junit.version" value="4.4" />
- <property name="retroweaver.version" value="2.0.5" />
++ <property name="junit.version" value="4.6" />
<property name="javacc-home.path" value="${dir.lib}" />
<!--Settings-->
@@ -146,7 +150,7 @@ diff -dur pmd-4.2.5.ORIG/bin/build.xml p
<target name="cpdjnlp" depends="dist" description="Uploads a new CPD JNLP thingy to the PMD web site">
<signjar jar="${dir.lib}/pmd-${version}.jar" storetype="${keystore.type}" alias="${keystore.alias}" keystore="${keystore.path}" storepass="${keystore.password}" />
-@@ -466,7 +377,7 @@
+@@ -466,18 +377,20 @@
<target name="javadoc" description="Generates Javadocs">
<mkdir dir="docs/api" />
@@ -155,7 +159,12 @@ diff -dur pmd-4.2.5.ORIG/bin/build.xml p
<tag name="todo" enabled="false"/>
<classpath>
<fileset dir="${dir.lib}">
-@@ -477,7 +388,7 @@
+ <include name="*.jar" />
+ </fileset>
+ <pathelement location="${ant.jar}" />
++ <path refid="dependencies.path" />
+ </classpath>
++ <link href="file:///usr/share/javadoc/objectweb-asm/" />
</javadoc>
</target>
Index: pmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pmd/devel/pmd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- pmd.spec 20 Nov 2009 17:06:26 -0000 1.11
+++ pmd.spec 2 Jun 2010 15:40:21 -0000 1.12
@@ -29,7 +29,7 @@
#
Name: pmd
Version: 4.2.5
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 0
Summary: Scans Java source code and looks for potential problems
License: BSD
@@ -51,6 +51,7 @@ BuildRequires: ant-junit
BuildRequires: junit4 = 0:4.6
BuildRequires: jaxen >= 0:1.1.1
BuildRequires: objectweb-asm >= 0:3.1
+BuildRequires: objectweb-asm-javadoc >= 0:3.1
BuildRequires: xml-commons-apis >= 1.3.02
Requires: jpackage-utils >= 0:1.6
Requires: java
@@ -58,7 +59,6 @@ Requires: jaxen >= 0:1.1.1
Requires: objectweb-asm >= 0:3.1
Requires: xerces-j2
Requires: xml-commons-apis >= 1.3.02
-Requires: jakarta-oro
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
Group: Development/Tools
@@ -84,14 +84,15 @@ TextPad, Maven, Ant, Gel, JCreator, and
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
+Requires: objectweb-asm-javadoc
%description javadoc
Javadoc for %{name}.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0
+%patch1
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
@@ -100,7 +101,7 @@ find . -name "*.jar" -exec rm -f {} \;
rm -f etc/fr_docs/copy_up.sh
%build
-ant -Djunit.version=4.6 jar
+ant
ant -f bin/build.xml -Ddir.lib=%{_javadir} javadoc
%install
@@ -154,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT
%{_javadocdir}/*
%changelog
+* Wed Jun 2 2010 Jerry James <loganjerry at gmail.com> - 0:4.2.5-6
+- Update objectweb-asm dependency for version 3.2.
+
* Fri Nov 20 2009 Jerry James <loganjerry at gmail.com> - 0:4.2.5-5
- Update junit4 dependency for junit 4.6.
More information about the scm-commits
mailing list