rpms/findbugs/F-10 findbugs-1.3.8-build.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 findbugs.spec, 1.3, 1.4 sources, 1.2, 1.3 findbugs-1.3.7-build.patch, 1.1, NONE

[Jerry James]

Author: jjames

Update of /cvs/pkgs/rpms/findbugs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26893/F-10

Modified Files:
	.cvsignore findbugs.spec sources 
Added Files:
	findbugs-1.3.8-build.patch 
Removed Files:
	findbugs-1.3.7-build.patch 
Log Message:
* Tue Mar 17 2009 Jerry James <loganjerry at gmail.com> - 1.3.8-1
- Update to 1.3.8


findbugs-1.3.8-build.patch:

--- NEW FILE findbugs-1.3.8-build.patch ---
diff -dur findbugs-1.3.8.ORIG/build.xml findbugs-1.3.8/build.xml
--- findbugs-1.3.8.ORIG/build.xml	2009-02-17 23:02:06.000000000 -0700
+++ findbugs-1.3.8/build.xml	2009-03-17 21:15:16.000000000 -0600
@@ -18,6 +18,8 @@
 	<property file="build.properties" />
 	
 	<property name="jar.dir" value="lib"/>
+	<property name="systemjar.dir" value="/usr/share/java"/>
+	<property name="xsl.stylesheet.home" value="/usr/share/sgml/docbook/xsl-stylesheets"/>
 	<property name="plugin.dir" value="plugin"/>
 	<property name="build.dir" value="build"/>
 	<property name="classes.dir" value="build/classes"/>
@@ -55,17 +57,18 @@
 	<property name="version.props.file" value="${build.dir}/classes/edu/umd/cs/findbugs/version.properties"/>
 	
 	<path id="findbugs.classpath">
-		<pathelement location="${jar.dir}/bcel.jar"/>
-		<pathelement location="${jar.dir}/dom4j-1.6.1.jar"/>
-		<pathelement location="${jar.dir}/AppleJavaExtensions.jar"/>
-		<pathelement location="${jar.dir}/junit.jar"/>
-		<pathelement location="${jar.dir}/asm-3.1.jar"/>
-		<pathelement location="${jar.dir}/asm-commons-3.1.jar"/>
-		<pathelement location="${jar.dir}/asm-tree-3.1.jar"/>
-		<pathelement location="${jar.dir}/jaxen-1.1.1.jar"/>		
-		<pathelement location="${jar.dir}/jsr305.jar"/>
-		<pathelement location="${jar.dir}/jFormatString.jar"/>
-		<pathelement location="${jar.dir}/commons-lang-2.4.jar"/>
+		<pathelement location="${systemjar.dir}/findbugs-bcel.jar"/>
+		<pathelement location="${systemjar.dir}/dom4j.jar"/>
+		<pathelement location="${systemjar.dir}/junit4.jar"/>
+		<pathelement location="${systemjar.dir}/objectweb-asm/asm.jar"/>
+		<pathelement location="${systemjar.dir}/objectweb-asm/asm-commons.jar"/>
+		<pathelement location="${systemjar.dir}/objectweb-asm/asm-tree.jar"/>
+		<pathelement location="${systemjar.dir}/jaxen.jar"/>		
+		<pathelement location="${systemjar.dir}/jsr-305.jar"/>
+		<pathelement location="${systemjar.dir}/jcip-annotations.jar"/>
+		<pathelement location="${systemjar.dir}/ant.jar"/>
+		<pathelement location="${systemjar.dir}/jFormatString.jar"/>
+		<pathelement location="${systemjar.dir}/commons-lang.jar"/>
 	</path>
 	
 	<path id="tools.classpath">
@@ -979,7 +982,7 @@
        <delete dir="${annotationDoc.dir}"/>
        <mkdir dir="${annotationDoc.dir}"/>
       <javadoc access="public" 
-       classpath="lib/bcel.jar:lib/junit.jar:lib/dom4j-1.6.1.jar:lib/jsr305.jar:lib/AppleJavaExtensions.jar"
+       classpath="${systemjar.dir}/findbugs-bcel.jar:${systemjar.dir}/junit4.jar:${systemjar.dir}/dom4j.jar:${systemjar.dir}/jsr-305.jar:${systemjar.dir}/jcip-annotations.jar"
         destdir="${annotationDoc.dir}" 
 	    packagenames="edu.umd.cs.findbugs.annotations"
         doctitle="FindBugs Annotation Documentation" 
diff -dur findbugs-1.3.8.ORIG/design/architecture/Makefile findbugs-1.3.8/design/architecture/Makefile
--- findbugs-1.3.8.ORIG/design/architecture/Makefile	2006-01-10 14:34:32.000000000 -0700
+++ findbugs-1.3.8/design/architecture/Makefile	2009-03-17 21:15:16.000000000 -0600
@@ -4,6 +4,7 @@
 %.pdf : %.tex
 	pdflatex $*
 	pdflatex $*
+	pdflatex $*
 
 all : $(PDFS)
 
diff -dur findbugs-1.3.8.ORIG/etc/MANIFEST-findbugs.MF findbugs-1.3.8/etc/MANIFEST-findbugs.MF
--- findbugs-1.3.8.ORIG/etc/MANIFEST-findbugs.MF	2008-10-02 17:13:14.000000000 -0600
+++ findbugs-1.3.8/etc/MANIFEST-findbugs.MF	2009-03-17 21:15:16.000000000 -0600
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
 Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
-Class-Path: bcel.jar dom4j-1.6.1.jar jaxen-1.1.1.jar asm-3.1.jar asm-tree-3.1.jar asm-commons-3.1.jar jsr305.jar jFormatString.jar commons-lang-2.4.jar 
+Class-Path: findbugs-bcel.jar dom4j.jar jaxen.jar objectweb-asm/asm.jar objectweb-asm/asm-tree.jar objectweb-asm/asm-commons.jar jsr-305.jar jcip-annotations.jar junit4.jar jFormatString.jar commons-lang.jar 
diff -dur findbugs-1.3.8.ORIG/etc/script.properties findbugs-1.3.8/etc/script.properties
--- findbugs-1.3.8.ORIG/etc/script.properties	2008-03-18 16:54:34.000000000 -0600
+++ findbugs-1.3.8/etc/script.properties	2009-03-17 21:15:16.000000000 -0600
@@ -93,7 +93,7 @@
 script.wrap.java=\
 	fb_javacmd=\${fb_javacmd:-"java"}\n\
 	fb_maxheap=\${fb_maxheap:-"-Xmx584m"}\n\
-	fb_appjar=\${fb_appjar:-"$findbugs_home/lib/findbugs.jar"}\n\
+	fb_appjar=\${fb_appjar:-"/usr/share/java/findbugs.jar"}\n\
 	set -f\n\
 	#echo command: \\\n\
 	exec "$fb_javacmd" \\\n\
@@ -105,7 +105,7 @@
 script.wrap.jar=\
 	fb_javacmd=\${fb_javacmd:-"java"}\n\
 	fb_maxheap=\${fb_maxheap:-"-Xmx584m"}\n\
-	fb_appjar=\${fb_appjar:-"$findbugs_home/lib/findbugs.jar"}\n\
+	fb_appjar=\${fb_appjar:-"/usr/share/java/findbugs.jar"}\n\
 	set -f\n\
 	#echo command: \\\n\
 	exec "$fb_javacmd" \\\n\
diff -dur findbugs-1.3.8.ORIG/src/scripts/standard/findbugs findbugs-1.3.8/src/scripts/standard/findbugs
--- findbugs-1.3.8.ORIG/src/scripts/standard/findbugs	2008-07-02 11:48:10.000000000 -0600
+++ findbugs-1.3.8/src/scripts/standard/findbugs	2009-03-17 21:15:16.000000000 -0600
@@ -10,7 +10,7 @@
 
 maxheap=768
 
-fb_appjar="$findbugs_home/lib/findbugs.jar"
+fb_appjar="/usr/share/java/findbugs.jar"
 
 ShowHelpAndExit() {
 	fb_mainclass="edu.umd.cs.findbugs.ShowHelp"
diff -dur findbugs-1.3.8.ORIG/src/scripts/standard/findbugs2 findbugs-1.3.8/src/scripts/standard/findbugs2
--- findbugs-1.3.8.ORIG/src/scripts/standard/findbugs2	2008-07-02 12:16:14.000000000 -0600
+++ findbugs-1.3.8/src/scripts/standard/findbugs2	2009-03-17 21:15:16.000000000 -0600
@@ -117,5 +117,5 @@
 	-Dfindbugs.home="$findbugs_home" \
 	$jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props \
 	-Dfindbugs.launchUI=$fb_launchui \
-	-jar $FINDBUGS_HOME/lib/findbugs.jar \
+	-jar /usr/share/java/findbugs.jar \
 	${@:+"$@"}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Mar 2009 01:54:37 -0000	1.2
+++ .cvsignore	18 Mar 2009 03:34:11 -0000	1.3
@@ -1 +1 @@
-findbugs-1.3.7-source.zip
+findbugs-1.3.8-source.zip


Index: findbugs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs/F-10/findbugs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- findbugs.spec	11 Mar 2009 03:01:07 -0000	1.3
+++ findbugs.spec	18 Mar 2009 03:34:11 -0000	1.4
@@ -4,8 +4,8 @@
 # specification, but Classpath does not support it.  This is a fatal problem.
 
 Name:           findbugs
-Version:        1.3.7
-Release:        6%{?dist}
+Version:        1.3.8
+Release:        1%{?dist}
 Summary:        Find bugs in Java code
 
 Group:          Development/Languages
@@ -17,7 +17,7 @@
 # This patch has not been submitted upstream, as it contains Fedora-specific
 # changes.  It looks in /usr/share/java for jar files at both compile time and
 # run time, instead of in findbugs' lib directory.
-Patch0:         findbugs-1.3.7-build.patch
+Patch0:         findbugs-1.3.8-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -182,6 +182,9 @@
 %{_javadir}/findbugs-tools*
 
 %changelog
+* Tue Mar 17 2009 Jerry James <loganjerry at gmail.com> - 1.3.8-1
+- Update to 1.3.8
+
 * Tue Mar 10 2009 Jerry James <loganjerry at gmail.com> - 1.3.7-6
 - Force building with OpenJDK; see GCJ note at the top of the spec file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Mar 2009 01:54:37 -0000	1.2
+++ sources	18 Mar 2009 03:34:11 -0000	1.3
@@ -1 +1 @@
-ae5ee33e7c07031cdec22c1da5e59b93  findbugs-1.3.7-source.zip
+a0f5f5a263259e163306857dc530a421  findbugs-1.3.8-source.zip


--- findbugs-1.3.7-build.patch DELETED ---