rpms/findbugs-contrib/devel .cvsignore, 1.3, 1.4 findbugs-contrib-build.patch, 1.1, 1.2 findbugs-contrib.spec, 1.6, 1.7 sources, 1.3, 1.4

[Jerry James]

Author: jjames

Update of /cvs/pkgs/rpms/findbugs-contrib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25897/devel

Modified Files:
	.cvsignore findbugs-contrib-build.patch findbugs-contrib.spec 
	sources 
Log Message:
* Mon Jan 18 2010 Jerry James <loganjerry at gmail.com> - 4.2.0-1
- Update to 4.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Oct 2009 15:19:53 -0000	1.3
+++ .cvsignore	18 Jan 2010 18:03:46 -0000	1.4
@@ -1 +1 @@
-fb-contrib-src-4.0.0.zip
+fb-contrib-src-4.2.0.zip

findbugs-contrib-build.patch:
 build.properties |    2 +-
 build.xml        |   15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

Index: findbugs-contrib-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/devel/findbugs-contrib-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- findbugs-contrib-build.patch	5 Oct 2009 15:19:53 -0000	1.1
+++ findbugs-contrib-build.patch	18 Jan 2010 18:03:46 -0000	1.2
@@ -1,17 +1,17 @@
-diff -dur findbugs-contrib-4.0.0.ORIG/build.properties findbugs-contrib-4.0.0/build.properties
---- findbugs-contrib-4.0.0.ORIG/build.properties	2009-08-14 01:20:46.000000000 -0600
-+++ findbugs-contrib-4.0.0/build.properties	2009-10-05 09:03:09.949639145 -0600
+--- build.properties.ORIG	2009-10-31 13:49:38.000000000 -0600
++++ build.properties	2010-01-18 10:51:18.710368270 -0700
 @@ -1 +1 @@
 -jdk14.home=C:/j2sdk1.4.2_13
 \ No newline at end of file
 +jdk14.home=/etc/alternatives/java
-diff -dur findbugs-contrib-4.0.0.ORIG/build.xml findbugs-contrib-4.0.0/build.xml
---- findbugs-contrib-4.0.0.ORIG/build.xml	2009-09-12 18:49:36.000000000 -0600
-+++ findbugs-contrib-4.0.0/build.xml	2009-10-05 09:04:54.211435432 -0600
-@@ -7,6 +7,7 @@
+--- build.xml.ORIG	2010-01-14 08:59:52.000000000 -0700
++++ build.xml	2010-01-18 10:53:43.653350132 -0700
+@@ -6,7 +6,8 @@
+ <project name="fb-contrib" default="install">
  	
  	<property file="build.properties"/>
- 	
+-	
++
 +	<property name="system.dir" value="/usr/share/java/"/>
  	<property name="src.dir" value="${basedir}/src"/>
  	<property name="classes.dir" value="${basedir}/classes"/>
@@ -23,7 +23,7 @@ diff -dur findbugs-contrib-4.0.0.ORIG/bu
 -			<pathelement location="${lib.dir}/findbugs.jar"/>
 -			<pathelement location="${lib.dir}/bcel.jar"/>
 +			<pathelement location="${system.dir}/findbugs.jar"/>
-+			<pathelement location="${system.dir}/bcel.jar"/>
++			<pathelement location="${system.dir}/findbugs-bcel.jar"/>
  		</path>
  		<path id="fb-contrib.samples.classpath">
 -			<pathelement location="${sampleslib.dir}/jsp-api.jar"/>


Index: findbugs-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/devel/findbugs-contrib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- findbugs-contrib.spec	5 Oct 2009 15:19:54 -0000	1.6
+++ findbugs-contrib.spec	18 Jan 2010 18:03:46 -0000	1.7
@@ -5,7 +5,7 @@
 %global eclipse_plugin_dir  %{eclipse_plugins_dir}/edu.umd.cs.findbugs.plugin.eclipse_%{eclipse_plugin_vers}.%{eclipse_plugin_date}
 
 Name:           findbugs-contrib
-Version:        4.0.0
+Version:        4.2.0
 Release:        1%{?dist}
 Summary:        Extra findbugs detectors
 
@@ -57,11 +57,10 @@ addition to the base findbugs detectors.
 
 %prep
 %setup -q -c
-%patch0 -p1
+%patch0
 
 # Remove the precompiled files
-rm -fr classes/com fb-contrib-*.jar fb-contrib-src-*.zip plugin lib/*
-rm -f samples/*.class samples/lib/*.jar
+rm -fr classes/com fb-contrib-*.jar lib/* samples/*.class samples/lib/*.jar
 
 # Remove the duplicated sources (!)
 rm -fr com
@@ -108,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{eclipse_plugin_dir}/fb-contrib-%{version}.jar
 
 %changelog
+* Mon Jan 18 2010 Jerry James <loganjerry at gmail.com> - 4.2.0-1
+- Update to 4.2.0
+
 * Mon Oct  5 2009 Jerry James <loganjerry at gmail.com> - 4.0.0-1
 - Update to 4.0.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Oct 2009 15:19:54 -0000	1.3
+++ sources	18 Jan 2010 18:03:46 -0000	1.4
@@ -1 +1 @@
-d5d5dc33b5670400f62b947bfa978f67  fb-contrib-src-4.0.0.zip
+d4ef12ec55d04c1731596c5dcd82a102  fb-contrib-src-4.2.0.zip