rpms/findbugs-contrib/F-12 findbugs-contrib-build.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 findbugs-contrib.spec, 1.5, 1.6 sources, 1.2, 1.3 findbugs-contrib-3.8.1-build.patch, 1.1, NONE

[Jerry James]

Author: jjames

Update of /cvs/pkgs/rpms/findbugs-contrib/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19716/F-12

Modified Files:
	.cvsignore findbugs-contrib.spec sources 
Added Files:
	findbugs-contrib-build.patch 
Removed Files:
	findbugs-contrib-3.8.1-build.patch 
Log Message:
* Mon Oct  5 2009 Jerry James <loganjerry at gmail.com> - 4.0.0-1
- Update to 4.0.0


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

--- NEW FILE findbugs-contrib-build.patch ---
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
@@ -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 @@
 	
 	<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"/>
 	<property name="lib.dir" value="${basedir}/lib"/>
@@ -40,14 +41,14 @@
 		<mkdir dir="${classes.dir}"/>
 		<mkdir dir="${javadoc.dir}"/>
 		<path id="fb-contrib.classpath">
-			<pathelement location="${lib.dir}/findbugs.jar"/>
-			<pathelement location="${lib.dir}/bcel.jar"/>
+			<pathelement location="${system.dir}/findbugs.jar"/>
+			<pathelement location="${system.dir}/bcel.jar"/>
 		</path>
 		<path id="fb-contrib.samples.classpath">
-			<pathelement location="${sampleslib.dir}/jsp-api.jar"/>
-			<pathelement location="${sampleslib.dir}/junit.jar"/>
-			<pathelement location="${sampleslib.dir}/servlet-api.jar"/>
-			<pathelement location="${sampleslib.dir}/log4j.jar"/>
+			<pathelement location="${system.dir}/jsp.jar"/>
+			<pathelement location="${system.dir}/junit4.jar"/>
+			<pathelement location="${system.dir}/servlet.jar"/>
+			<pathelement location="${system.dir}/log4j.jar"/>
 		</path>
 		<mkdir dir="${classes.dir}/com"/>
 		<mkdir dir="${classes.dir}/com/mebigfatguy"/>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Jun 2009 04:07:38 -0000	1.2
+++ .cvsignore	5 Oct 2009 15:19:52 -0000	1.3
@@ -1 +1 @@
-fb-contrib-src-3.8.1.zip
+fb-contrib-src-4.0.0.zip


Index: findbugs-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/F-12/findbugs-contrib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- findbugs-contrib.spec	26 Aug 2009 14:08:45 -0000	1.5
+++ findbugs-contrib.spec	5 Oct 2009 15:19:53 -0000	1.6
@@ -5,8 +5,8 @@
 %global eclipse_plugin_dir  %{eclipse_plugins_dir}/edu.umd.cs.findbugs.plugin.eclipse_%{eclipse_plugin_vers}.%{eclipse_plugin_date}
 
 Name:           findbugs-contrib
-Version:        3.8.1
-Release:        4%{?dist}
+Version:        4.0.0
+Release:        1%{?dist}
 Summary:        Extra findbugs detectors
 
 Group:          Development/Languages
@@ -16,7 +16,7 @@ Source0:        http://downloads.sourcef
 # 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 using the jars in lib/.
-Patch0:         findbugs-contrib-3.8.1-build.patch
+Patch0:         findbugs-contrib-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -66,10 +66,6 @@ rm -f samples/*.class samples/lib/*.jar
 # Remove the duplicated sources (!)
 rm -fr com
 
-# Fix DOS line endings
-sed -i -e 's/\r//g' license.txt
-find samples -type f | xargs sed -i -e 's/\r//g'
-
 %build
 ant build
 ant javadoc
@@ -112,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{eclipse_plugin_dir}/fb-contrib-%{version}.jar
 
 %changelog
+* Mon Oct  5 2009 Jerry James <loganjerry at gmail.com> - 4.0.0-1
+- Update to 4.0.0
+
 * Wed Aug 26 2009 Jerry James <loganjerry at gmail.com> - 3.8.1-4
 - Rebuilt for findbugs 1.3.9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Jun 2009 04:07:38 -0000	1.2
+++ sources	5 Oct 2009 15:19:53 -0000	1.3
@@ -1 +1 @@
-66cd1813ee1d4b12321b43435694e5c1  fb-contrib-src-3.8.1.zip
+d5d5dc33b5670400f62b947bfa978f67  fb-contrib-src-4.0.0.zip


--- findbugs-contrib-3.8.1-build.patch DELETED ---