[findbugs] Update to 2.0.2

richardfearn richardfearn at fedoraproject.org
Wed Sep 11 21:02:51 UTC 2013


commit 3a776826e8f010a5ea09457a3f23e3463706a064
Author: Richard Fearn <richard.fearn at diamond.ac.uk>
Date:   Tue Sep 10 20:02:38 2013 +0100

    Update to 2.0.2

 .gitignore                      |    1 +
 findbugs-1.3.7.pom              |   74 ---------------------
 findbugs-1.3.9-build.patch      |  120 ----------------------------------
 findbugs-1.3.9-pom.patch        |   45 -------------
 findbugs-2.0.1.pom              |   75 +++++++++++++++++++++
 findbugs-ant                    |    4 +-
 findbugs-asm-version.patch      |   24 -------
 findbugs-build.patch            |   70 ++++++++++++++++++++
 findbugs-fedora.patch           |  137 +++++++++++++++++++++++++++++++++++++++
 findbugs-home.patch             |   12 ----
 findbugs-jar-filenames.patch    |   39 -----------
 findbugs-remove-classpath.patch |   45 -------------
 findbugs.spec                   |   92 +++++++++------------------
 sources                         |    2 +-
 14 files changed, 316 insertions(+), 424 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6950dea..449c6a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 findbugs-1.3.9-source.zip
+/findbugs-2.0.2-source.zip
diff --git a/findbugs-2.0.1.pom b/findbugs-2.0.1.pom
new file mode 100644
index 0000000..251cc29
--- /dev/null
+++ b/findbugs-2.0.1.pom
@@ -0,0 +1,75 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.code.findbugs</groupId>
+  <artifactId>findbugs</artifactId>
+  <version>2.0.1</version>
+  <packaging>jar</packaging>
+  <url>http://findbugs.sourceforge.net/</url>
+  <name>FindBugs</name>
+  <description>Findbugs: Because it's easy!</description>
+  <licenses>
+    <license>
+      <name>GNU Lesser Public License</name>
+      <url>http://www.gnu.org/licenses/lgpl.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:svn:http://findbugs.googlecode.com/svn/trunk/</connection>
+    <developerConnection>scm:svn:https://findbugs.googlecode.com/svn/trunk/</developerConnection>
+    <url>http://findbugs.googlecode.com/svn/trunk/</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>bcel</artifactId>
+      <version>2.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>2.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jFormatString</artifactId>
+      <version>2.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>annotations</artifactId>
+      <version>2.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+      <version>1.6.1</version>
+    </dependency>
+    <dependency>
+      <groupId>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
+      <version>1.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>3.3</version>
+    </dependency>
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm-tree</artifactId>
+      <version>3.3</version>
+    </dependency>
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm-commons</artifactId>
+      <version>3.3</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.4</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/findbugs-ant b/findbugs-ant
index 02de7c3..8f90b79 100644
--- a/findbugs-ant
+++ b/findbugs-ant
@@ -1,3 +1,3 @@
-findbugs ant/ant-findbugs commons-lang dom4j findbugs-bcel jaxen
-jcip-annotations jFormatString jsr-305 junit4 objectweb-asm/asm
+findbugs ant/ant-findbugs apache-commons-lang dom4j findbugs-bcel jaxen
+jcip-annotations jFormatString jsr-305 junit objectweb-asm/asm
 objectweb-asm/asm-commons objectweb-asm/asm-tree
diff --git a/findbugs-build.patch b/findbugs-build.patch
new file mode 100644
index 0000000..c967f2d
--- /dev/null
+++ b/findbugs-build.patch
@@ -0,0 +1,70 @@
+diff --git a/build.xml b/build.xml
+index 89b95a6..44c8144 100644
+--- a/build.xml
++++ b/build.xml
+@@ -18,6 +18,7 @@
+     <property file="build.properties" />
+ 
+     <property name="jar.dir" value="lib"/>
++    <property name="systemjar.dir" value="/usr/share/java"/>
+     <property name="plugin.dir" value="plugin"/>
+     <property name="build.dir" value="build"/>
+     <property name="junit.dir" value="build/junit"/>
+@@ -59,24 +60,23 @@
+     <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.3.jar"/>
+-        <pathelement location="${jar.dir}/asm-commons-3.3.jar"/>
+-        <pathelement location="${jar.dir}/asm-tree-3.3.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="${jar.dir}/jcip-annotations.jar"/>
++        <pathelement location="${systemjar.dir}/findbugs-bcel.jar"/>
++        <pathelement location="${systemjar.dir}/dom4j.jar"/>
++        <pathelement location="${systemjar.dir}/junit.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}/jFormatString.jar"/>
++        <pathelement location="${systemjar.dir}/apache-commons-lang.jar"/>
++        <pathelement location="${systemjar.dir}/jcip-annotations.jar"/>
+     </path>
+ 
+     <path id="tools.classpath">
+         <pathelement location="${classes.dir}"/>
+         <pathelement location="${jar.dir}/findbugs.jar"/>
+-        <pathelement location="${jar.dir}/jdepend-2.9.jar"/>
++        <pathelement location="${systemjar.dir}/jdepend.jar"/>
+         <path refid="findbugs.classpath"/>
+     </path>
+ 
+@@ -313,8 +313,6 @@
+             <fileset dir="${src.dir}">
+                 <include name="**/annotations/*.java"/>
+             </fileset>
+-            <zipfileset src="${jar.dir}/jcip-annotations.jar" excludes="META-INF/**,**/*.html"/>
+-            <zipfileset src="${jar.dir}/jsr305.jar" excludes="META-INF/**,**/*.html"/>
+         </jar>
+     </target>
+ 
+diff --git a/design/architecture/Makefile b/design/architecture/Makefile
+index 8765025..0fc7869 100644
+--- a/design/architecture/Makefile
++++ b/design/architecture/Makefile
+@@ -4,6 +4,7 @@ PDFS = $(TEX_SRCS:.tex=.pdf)
+ %.pdf : %.tex
+ 	pdflatex $*
+ 	pdflatex $*
++	pdflatex $*
+ 
+ all : $(PDFS)
+ 
diff --git a/findbugs-fedora.patch b/findbugs-fedora.patch
new file mode 100644
index 0000000..7b8d4d3
--- /dev/null
+++ b/findbugs-fedora.patch
@@ -0,0 +1,137 @@
+diff --git a/etc/MANIFEST-findbugs.MF b/etc/MANIFEST-findbugs.MF
+index 9f7dc04..9d885be 100644
+--- a/etc/MANIFEST-findbugs.MF
++++ b/etc/MANIFEST-findbugs.MF
+@@ -1,3 +1 @@
+ 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.3.jar asm-tree-3.3.jar asm-commons-3.3.jar jsr305.jar jFormatString.jar commons-lang-2.4.jar
+diff --git a/etc/script.properties b/etc/script.properties
+index f595a9a..0e28c6e 100644
+--- a/etc/script.properties
++++ b/etc/script.properties
+@@ -3,48 +3,8 @@
+ # variable.  Also sets the fb_osname shell variable,
+ # as the output of uname.
+ script.get.fbhome=\
+-    program="$0"\n\
+-    \n\
+-    # Follow symlinks until we get to the actual file.\n\
+-    while [ -h "$program" ]; do\n\
+-    \tlink=`ls -ld "$program"`\n\
+-    \tlink=`expr "$link" : '.*-> \\(.*\\)'`\n\
+-    \tif [ "`expr "$link" : '/.*'`" = 0 ]; then\n\
+-    \t\t# Relative\n\
+-    \t\tdir=`dirname "$program"`\n\
+-    \t\tprogram="$dir/$link"\n\
+-    \telse\n\
+-    \t\t# Absolute\n\
+-    \t\tprogram="$link"\n\
+-    \tfi\n\
+-    done\n\
+-    \n\
+-    # Assume findbugs home directory is the parent\n\
+-    # of the directory containing the script (which should\n\
+-    # normally be "$findbugs_home/bin").\n\
+-    dir=`dirname "$program"`\n\
+-    findbugs_home="$dir/.."\n\
+-    \n\
+-    # Handle FHS-compliant installations (e.g., Fink)\n\
+-    if [ -d "$findbugs_home/share/findbugs" ]; then\n\
+-    \tfindbugs_home="$findbugs_home/share/findbugs"\n\
+-    fi\n\
+-    \n\
+-    # Make absolute\n\
+-    findbugs_home=`cd "$findbugs_home" && pwd`\n\
+-    \n\
+-    fb_pathsep=':'\n\
+-    \n\
+-    # Handle cygwin, courtesy of Peter D. Stout\n\
++    findbugs_home=/usr/share/findbugs\n\
+     fb_osname=`uname`\n\
+-    if [ `expr "$fb_osname" : CYGWIN` -ne 0 ]; then\n\
+-    \tfindbugs_home=`cygpath --mixed "$findbugs_home"`\n\
+-    \tfb_pathsep=';'\n\
+-    fi\n\
+-    # Handle MKS, courtesy of Kelly O'Hair\n\
+-    if [ "${fb_osname}" = "Windows_NT" ]; then\n\
+-    \tfb_pathsep=';'\n\
+-    fi\n\
+     \n\
+     if [ ! -d "$findbugs_home" ]; then\n\
+     \techo "The path $findbugs_home,"\n\
+@@ -88,16 +48,18 @@ script.set.default.java=\
+ 
+ # Fragment to execute java, using the arguments stored
+ # in the shell's $@ variable (and/or in the $fb_appargs variable).
+-# Unless fb_appjar is specified, assumes the class to be executed
+-# is in $findbugs_home/lib/findbugs.jar.
+ script.wrap.java=\
+     fb_javacmd=\${fb_javacmd:-"java"}\n\
+     fb_maxheap=\${fb_maxheap:-"-Xmx768m"}\n\
+-    fb_appjar=\${fb_appjar:-"$findbugs_home/lib/findbugs.jar"}\n\
++    \n\
++    fb_classpath=\$(build-classpath findbugs findbugs-bcel dom4j jaxen \\\n\
++    \tobjectweb-asm/asm objectweb-asm/asm-tree objectweb-asm/asm-commons \\\n\
++    \tjsr-305 jFormatString apache-commons-lang)\n\
++    \n\
+     set -f\n\
+     #echo command: \\\n\
+     exec "$fb_javacmd" \\\n\
+-    \t-classpath "$fb_appjar$fb_pathsep$CLASSPATH" \\\n\
++    \t-classpath "$fb_classpath" \\\n\
+     \t-Dfindbugs.home="$findbugs_home"\\\n\
+     \t$fb_maxheap $fb_jvmargs $fb_mainclass \${@:+"$@"} $fb_appargs
+ 
+diff --git a/src/scripts/standard/fb b/src/scripts/standard/fb
+index 1f42652..d8fa084 100644
+--- a/src/scripts/standard/fb
++++ b/src/scripts/standard/fb
+@@ -9,8 +9,6 @@
+ @SET_DEFAULT_JAVA@
+ 
+ 
+-fb_appjar="$findbugs_home/lib/findbugs.jar"
+-
+ ShowHelpAndExit() {
+ 	fb_mainclass="edu.umd.cs.findbugs.ShowHelp"
+ 	@WRAP_JAVA@
+diff --git a/src/scripts/standard/findbugs b/src/scripts/standard/findbugs
+index d5bd992..779a61a 100644
+--- a/src/scripts/standard/findbugs
++++ b/src/scripts/standard/findbugs
+@@ -8,8 +8,6 @@
+ 
+ @SET_DEFAULT_JAVA@
+ 
+-fb_appjar="$findbugs_home/lib/findbugs.jar"
+-
+ ShowHelpAndExit() {
+ 	fb_mainclass="edu.umd.cs.findbugs.ShowHelp"
+ 	@WRAP_JAVA@
+diff --git a/src/scripts/standard/findbugs2 b/src/scripts/standard/findbugs2
+index 36c054b..55fcf5e 100644
+--- a/src/scripts/standard/findbugs2
++++ b/src/scripts/standard/findbugs2
+@@ -109,13 +109,19 @@ if [ $fb_osname = "Darwin" ]; then
+ 		-Dapple.laf.useScreenMenuBar=true"
+ fi
+ 
++fb_classpath=$(build-classpath findbugs findbugs-bcel dom4j jaxen \
++	objectweb-asm/asm objectweb-asm/asm-tree objectweb-asm/asm-commons \
++	jsr-305 jFormatString apache-commons-lang)
++
++fb_mainclass=edu.umd.cs.findbugs.LaunchAppropriateUI
++
+ #
+ # Launch JVM
+ #
+ exec "$fb_javacmd" \
+-	-classpath "$fb_appjar$fb_pathsep$CLASSPATH" \
++	-classpath "$fb_classpath" \
+ 	-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 \
++	$fb_mainclass \
+ 	${@:+"$@"}
diff --git a/findbugs.spec b/findbugs.spec
index e0e2f62..92ae08c 100644
--- a/findbugs.spec
+++ b/findbugs.spec
@@ -1,11 +1,6 @@
-# GCJ note: findbugs currently cannot be compiled with GCJ.  There are several
-# problems, most of which could be fixed with a little effort.  However,
-# findbugs uses java.util.regex.Pattern.LITERAL, which is part of the Java 5
-# specification, but Classpath does not support it.  This is a fatal problem.
-
 Name:           findbugs
-Version:        1.3.9
-Release:        17%{?dist}
+Version:        2.0.2
+Release:        1%{?dist}
 Summary:        Find bugs in Java code
 
 Group:          Development/Languages
@@ -16,33 +11,19 @@ Source1:        findbugs-ant
 Source2:        findbugs-tools-README
 
 # Versions will be fixed in a patch
-Source3:        http://repo1.maven.org/maven2/net/sourceforge/findbugs/findbugs/1.3.7/findbugs-1.3.7.pom
+Source3:        http://search.maven.org/remotecontent?filepath=com/google/code/findbugs/findbugs/2.0.1/findbugs-2.0.1.pom
 Source4:        http://repo1.maven.org/maven2/net/sourceforge/findbugs/annotations/1.3.2/annotations-1.3.2.pom
 
 # 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.9-build.patch
-
-# Build against ASM 3.3 instead of 3.1. Already changed upstream; see:
-# http://code.google.com/p/findbugs/source/detail?r=12605
-# http://code.google.com/p/findbugs/source/detail?r=12606
-Patch1:         findbugs-asm-version.patch
-%define asm_version 3.3
-
-# Updates the version information in POMs, as we don't have up to date POM's :(
-Patch2:         findbugs-1.3.9-pom.patch
-
-# Fedora-specific patch: use Fedora JAR filenames
-Patch3:         findbugs-jar-filenames.patch
-
-# Fedora-specific patch to cope with removal of Class-Path & Main-Class entries
-# from findbugs.jar manifest
-Patch4:         findbugs-remove-classpath.patch
+# changes.  It looks in /usr/share/java for jar files at compile time, instead
+# of in findbugs' lib directory.
+Patch0:         findbugs-build.patch
 
-# Fedora-specific patch to allow FindBugs launcher scripts to be run from
-# /bin or /usr/bin (#848612)
-Patch5:         findbugs-home.patch
+# Fedora-specific patch:
+#  - Remove Class-Path entry from findbugs.jar manifest; use build-classpath
+#    instead (#575632)
+#  - Simplify shell fragment that determines findbugs_home (also fixes #848612)
+Patch1:         findbugs-fedora.patch
 
 BuildArch:      noarch
 
@@ -58,7 +39,7 @@ BuildRequires:  jFormatString
 BuildRequires:  jpackage-utils
 BuildRequires:  jsr-305
 BuildRequires:  junit4
-BuildRequires:  objectweb-asm >= %{asm_version}
+BuildRequires:  objectweb-asm
 BuildRequires:  perl
 BuildRequires:  tex(latex)
 BuildRequires:  texlive-preprint
@@ -71,7 +52,7 @@ Requires:       jFormatString
 Requires:       jpackage-utils
 Requires:       jsr-305
 Requires:       junit4
-Requires:       objectweb-asm >= %{asm_version}
+Requires:       objectweb-asm
 
 %description
 Findbugs is a program which uses static analysis to look for bugs in Java code.
@@ -112,32 +93,21 @@ README.fedora for more information.
 %patch1 -p1
 
 cp -p %{SOURCE3} findbugs.pom
+sed -i 's/2\.0\.1/2\.0\.2/g' findbugs.pom
 cp -p %{SOURCE4} annotations.pom
-
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+sed -i 's/1\.3\.2/2\.0\.2/g' annotations.pom
 
 cp -p %{SOURCE2} README.fedora
 
 # Make sure we don't accidentally use any existing JAR files
 rm -f lib/*.jar
 
-# Use the system jcip-annotations instead of building it in
-rm -fr src/java5/net
-
 # Get rid of code for Mac OS X that depends on a jar from Apple
-rm -f src/java/edu/umd/cs/findbugs/gui/OSXAdapter.java
-rm -f src/java5/edu/umd/cs/findbugs/gui2/OSXAdapter.java
+rm -f src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java
 
 # Turn on the executable bits for some auxiliary scripts
 chmod a+x etc/summarizeBugs etc/diffBugSummaries design/architecture/mkdep.pl
 
-# Remove Class-Path & Main-Class entries from findbugs.jar manifest
-sed -i '/class-path/I d' etc/MANIFEST-findbugs.MF
-sed -i '/Main-Class/ d' etc/MANIFEST-findbugs.MF
-
 %build
 # Build the class files
 ant
@@ -158,17 +128,13 @@ jar cf ../../lib/findbugs-tools.jar edu/umd/cs/findbugs/tools
 %install
 # Install the jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p lib/annotations.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-annotations-%{version}.jar
-ln -s %{name}-annotations-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-annotations.jar
-cp -p lib/%{name}-tools.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tools-%{version}.jar
-ln -s %{name}-tools-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tools.jar
-cp -p lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -p lib/annotations.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-annotations.jar
+cp -p lib/%{name}-tools.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tools.jar
+cp -p lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # Install the ant task
 mkdir -p $RPM_BUILD_ROOT%{_javadir}/ant
-cp -p lib/%{name}-ant.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-%{name}-%{version}.jar
-ln -s ant-%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-%{name}.jar
+cp -p lib/%{name}-ant.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-%{name}.jar
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name}
 
@@ -179,7 +145,7 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # Install the scripts
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-for f in $(find bin -maxdepth 1 -type f \! -name '*.bat'); do
+for f in $(find bin -maxdepth 1 -type f \! -name '*.bat' \! -name '*.ico'); do
   cp -p $f $RPM_BUILD_ROOT%{_bindir}
 done
 
@@ -200,30 +166,32 @@ cp annotations.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-annotations.pom
 %add_maven_depmap JPP-%{name}-annotations.pom %{name}-annotations.jar
 
 %files
-%doc LICENSE.txt design/DecouplingFromBCEL.txt design/VisitingAndCaching.txt
+%doc licenses/LICENSE.txt design/DecouplingFromBCEL.txt design/VisitingAndCaching.txt
 %doc README.txt "design/eclipse findbugs plugin features.sxw"
 %doc design/architecture/architecture.pdf doc
 %{_bindir}/*
 %{_datadir}/%{name}
-%{_javadir}/findbugs-annotations*
-%{_javadir}/findbugs-%{version}.jar
+%{_javadir}/findbugs-annotations.jar
 %{_javadir}/findbugs.jar
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files -n ant-findbugs
-%doc LICENSE.txt
-%{_javadir}/ant/*
+%doc licenses/LICENSE.txt
+%{_javadir}/ant/ant-findbugs.jar
 %config(noreplace) %{_sysconfdir}/ant.d/%{name}
 
 %files javadoc
 %{_javadocdir}/*
 
 %files tools
-%doc LICENSE.txt README.fedora
-%{_javadir}/findbugs-tools*
+%doc licenses/LICENSE.txt README.fedora
+%{_javadir}/findbugs-tools.jar
 
 %changelog
+* Wed Sep 11 2013 Richard Fearn <richardfearn at gmail.com> - 2.0.2-1
+- Update to 2.0.2
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.9-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index c2a39af..5745b45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bcc6c57396b9e4385207a6a280697eca  findbugs-1.3.9-source.zip
+35ae20351c72885d241e7b7f8fb9cb2d  findbugs-2.0.2-source.zip


More information about the scm-commits mailing list