Hello community,

here is the log from the commit of package findbugs for openSUSE:Factory 
checked in at 2013-09-11 13:39:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/findbugs (Old)
 and      /work/SRC/openSUSE:Factory/.findbugs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "findbugs"

Changes:
--------
--- /work/SRC/openSUSE:Factory/findbugs/findbugs.changes        2012-12-19 
10:54:16.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.findbugs.new/findbugs.changes   2013-09-11 
13:39:54.000000000 +0200
@@ -1,0 +2,26 @@
+Wed Sep  4 08:05:16 UTC 2013 - [email protected]
+
+- Drop useless texlive from BR 
+
+-------------------------------------------------------------------
+Tue Sep  3 12:48:36 UTC 2013 - [email protected]
+
+- Rework spec file
+  * fixed rpm groups
+  * splitted ant task to ant-findbugs
+  * use url when possible
+  * grab Fedora patches
+  * change dependency on findbugs-bcel
+  * use new add_maven_depmap
+- Patches added
+  * findbugs-1.3.9-build.patch
+  * findbugs-1.3.9-pom.patch
+  * findbugs-asm-version.patch
+  * findbugs-home.patch
+  * findbugs-jar-filenames.patch
+  * findbugs-remove-classpath.patch
+- Patches removed
+  * findbugs-build_xml.patch
+  * findbugs-manifest.patch
+
+-------------------------------------------------------------------

Old:
----
  findbugs-1.3.9.pom
  findbugs-annotations-1.3.9.pom
  findbugs-ant-1.3.9.pom
  findbugs-build_xml.patch
  findbugs-coreplugin-1.3.9.pom
  findbugs-manifest.patch
  findbugs-script
  jFormatString-1.3.9.pom

New:
----
  annotations-1.3.2.pom
  findbugs-1.3.7.pom
  findbugs-1.3.9-build.patch
  findbugs-1.3.9-pom.patch
  findbugs-ant
  findbugs-asm-version.patch
  findbugs-home.patch
  findbugs-jar-filenames.patch
  findbugs-remove-classpath.patch
  findbugs-tools-README

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ findbugs.spec ++++++
--- /var/tmp/diff_new_pack.diZG0F/_old  2013-09-11 13:39:55.000000000 +0200
+++ /var/tmp/diff_new_pack.diZG0F/_new  2013-09-11 13:39:55.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package findbugs
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2009, JPackage Project
 # All rights reserved.
 #
@@ -18,44 +18,59 @@
 #
 
 
-%define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
-
 %bcond_with bundled_jformatstring
 
-%define section free
+%global _iconsdir %{_datadir}/icons/
 
 Name:           findbugs
 Version:        1.3.9
 Release:        0
 Summary:        Bug Pattern Detector for Java
 License:        LGPL-2.1+
-Group:          Development/Debug
+Group:          Development/Languages/Java
 Url:            http://findbugs.sourceforge.net/
-# bnc#569639
-# rm src/xsl/fancy.xsl
-# rm -rf doc/
+
 Source0:        
http://download.sourceforge.net/findbugs/findbugs-%{version}-source-suse.tar.bz2
-Source1:        findbugs-script
-Source2:        findbugs-16x16.png
-Source3:        findbugs-32x32.png
-Source4:        findbugs-48x48.png
-Source5:        findbugs.desktop
-Source6:        findbugs-1.3.9.pom
-Source7:        findbugs-annotations-1.3.9.pom
-Source8:        findbugs-ant-1.3.9.pom
-Source9:        findbugs-coreplugin-1.3.9.pom
-Source10:       jFormatString-1.3.9.pom
+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
+Source4:        
http://repo1.maven.org/maven2/net/sourceforge/findbugs/annotations/1.3.2/annotations-1.3.2.pom
+Source10:       findbugs-16x16.png
+Source11:       findbugs-32x32.png
+Source12:       findbugs-48x48.png
+Source13:       findbugs.desktop
 Source1000:     README.manual
-Patch0:         findbugs-build_xml.patch
-Patch1:         findbugs-bcel.patch
-Patch2:         findbugs-manifest.patch
+
+# 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
+
+# Fedora-specific patch to allow FindBugs launcher scripts to be run from
+# /bin or /usr/bin (#848612)
+Patch5:         findbugs-home.patch
+
 Requires(post): jpackage-utils >= 1.7.3
 Requires(postun): jpackage-utils >= 1.7.3
-Requires:       bcel5_3
 Requires:       dom4j
+Requires:       findbugs-bcel
 Requires:       jakarta-commons-lang >= 2.4
 Requires:       java >= 1.6.0
 Requires:       jaxen
@@ -66,12 +81,13 @@
 %endif
 Requires:       jpackage-utils >= 1.7.3
 Requires:       jsr-305
+
 BuildRequires:  ant >= 1.6.5
 BuildRequires:  ant-junit
 BuildRequires:  ant-nodeps
-BuildRequires:  bcel5_3
 BuildRequires:  desktop-file-utils
 BuildRequires:  dom4j
+BuildRequires:  findbugs-bcel
 BuildRequires:  jakarta-commons-lang >= 2.4
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  jaxen
@@ -80,15 +96,16 @@
 %if %without bundled_jformatstring
 BuildRequires:  jformatstring
 %endif
+BuildRequires:  fdupes
 BuildRequires:  jpackage-utils >= 1.7.3
 BuildRequires:  jsr-305
 BuildRequires:  junit4
 BuildRequires:  objectweb-asm >= 3.0
-%if %{defined suse_version}
-BuildRequires:  fdupes
+#FIXME: can't install buildroot with texlive-latex
+#BuildRequires:  texlive-latex
+BuildRequires:  update-desktop-files
 # owns /usr/share/icons/hicolor
 BuildRequires:  hicolor-icon-theme
-%endif
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -97,6 +114,17 @@
 instances of ``bug patterns''---code instances that are likely to be 
 errors.
 
+%package -n ant-findbugs
+Summary:        Ant task for findbugs
+Group:          Development/Languages/Java
+Requires:       %{name} = %{version}-%{release}
+Requires:       ant
+Provides:       %{name}:%{_sysconfdir}/ant.d/%{name}
+
+%description -n ant-findbugs
+This package defines an ant task for findbugs for easy integration of findbugs
+into your ant-controlled project.
+
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation/HTML
@@ -105,19 +133,29 @@
 
 %{summary}.
 
-%package manual
-Summary:        Documents for %{name}
-Group:          Documentation/Other
-
-%description manual
-
-%{summary}.
+%package tools
+Summary:        Addon tools for findbugs
+Group:          Development/Languages/Java
+Requires:       %{name} = %{version}-%{release}
+Requires:       junit4
+
+%description tools
+This package contains additional tools for use with findbugs.  See
+README.tools for more information.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 %patch1 -p1
+
+cp -p %{SOURCE2} README.tools
+cp -p %{SOURCE3} findbugs.pom
+cp -p %{SOURCE4} annotations.pom
+
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %{_bindir}/find . -name "*.bat" | %{_bindir}/xargs -t %{__rm}
 
@@ -134,203 +172,136 @@
 %{__rm} -r jFormatString/
 %endif
 
+find -name "*.jar" \
 %if %with bundled_jformatstring
-%{_bindir}/find -name "*.jar" -and -not -name jFormatString.jar | 
%{_bindir}/xargs -t %{__rm}
-%else
-%{_bindir}/find -name "*.jar" | %{_bindir}/xargs -t %{__rm}
+    -and -not -name jFormatString.jar \
 %endif
+    | %{_bindir}/xargs -t %{__rm}
 
-%{__rm} src/java/edu/umd/cs/findbugs/gui/OSXAdapter.java
-%{__rm} src/java5/edu/umd/cs/findbugs/gui2/OSXAdapter.java
+# Use the system jcip-annotations instead of building it in
+rm -fr src/java5/net
 
-%{__rm} -r src/java5/net/jcip/annotations
+# 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
 
-pushd lib
-%{__ln_s} $(build-classpath bcel5.3)
-%{__ln_s} $(build-classpath commons-lang)
-%{__ln_s} $(build-classpath dom4j)
-%{__ln_s} $(build-classpath jaxen)
-%{__ln_s} $(build-classpath jcip-annotations)
-%{__ln_s} $(build-classpath jdepend)
-%if %without bundled_jformatstring
-%{__ln_s} $(build-classpath jformatstring) jFormatString.jar
-%endif
-%{__ln_s} $(build-classpath jsr-305)
-%{__ln_s} $(build-classpath junit4)
-%{__ln_s} $(build-classpath objectweb-asm/asm)
-%{__ln_s} $(build-classpath objectweb-asm/asm-commons)
-%{__ln_s} $(build-classpath objectweb-asm/asm-tree)
-popd
+# Turn on the executable bits for some auxiliary scripts
+chmod a+x etc/summarizeBugs etc/diffBugSummaries design/architecture/mkdep.pl
 
-%if 0
-# FIXME: setup is monolithic right now, as especially the ant task
-# doesn't read the CLASSPATH
-%{__perl} -p -i -e 's|^Class-Path:.*\n||g' etc/*.MF
-%endif
+# 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
 
 cp %{SOURCE1000} .
 
 %build
-export CLASSPATH=
-export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/{junit,nodeps}`"
-
 if [ `uname -m` = "ppc64" ];then
        export ANT_OPTS="-Xss2m"
 else
        export ANT_OPTS="-Xss1m"
 fi
-%{ant} build apiJavadoc runjunit
 
-%install
-%{__mkdir_p} %{buildroot}%{_javadir}/%{name}/lib
-%{__cp} -p lib/findbugs.jar 
%{buildroot}%{_javadir}/%{name}/lib/findbugs-%{version}.jar
-%{__cp} -p lib/findbugs-ant.jar 
%{buildroot}%{_javadir}/%{name}/lib/findbugs-ant-%{version}.jar
-%{__cp} -p lib/annotations.jar 
%{buildroot}%{_javadir}/%{name}/lib/annotations-%{version}.jar
-%if %with bundled_jformatstring
-%{__cp} -p lib/jFormatString.jar 
%{buildroot}%{_javadir}/%{name}/lib/jFormatString-%{version}.jar
-%endif
+# Build the class files
+ant
 
-pushd %{buildroot}%{_javadir}/%{name}/lib
-%{__ln_s} $(build-classpath bcel5.3)
-%{__ln_s} $(build-classpath commons-lang)
-%{__ln_s} $(build-classpath dom4j)
-%{__ln_s} $(build-classpath jaxen)
-%{__ln_s} $(build-classpath jcip-annotations)
-%if %without bundled_jformatstring
-%{__ln_s} $(build-classpath jformatstring) jFormatString.jar
-%endif
-%{__ln_s} $(build-classpath jsr-305)
-%{__ln_s} $(build-classpath objectweb-asm/asm)
-%{__ln_s} $(build-classpath objectweb-asm/asm-commons)
-%{__ln_s} $(build-classpath objectweb-asm/asm-tree)
-for jar in *-%{version}*; do %{__ln_s} ${jar} ${jar/-%{version}/}; done
-popd
-
-%{__cp} -pr plugin/ %{buildroot}%{_javadir}/%{name}/
+# Build the javadocs
+ant apiJavadoc
 
-%{__mkdir_p} %{buildroot}%{_sysconfdir}/ant.d
-%{__cat} > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
-findbugs/lib/findbugs findbugs/lib/findbugs-ant
-EOF
-
-%{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
-%{__cp} -p %{SOURCE6} 
%{buildroot}%{_datadir}/maven2/poms/JPP.findbugs.lib-findbugs.pom
-%add_to_maven_depmap %{name} %{name} %{version} JPP/%{name}/lib %{name}
-%{__cp} -p %{SOURCE7} 
%{buildroot}%{_datadir}/maven2/poms/JPP.findbugs.lib-annotations.pom
-%add_to_maven_depmap %{name} annotations %{version} JPP/%{name}/lib annotations
-%{__cp} -p %{SOURCE8} 
%{buildroot}%{_datadir}/maven2/poms/JPP.findbugs.lib-findbugs-ant.pom
-%add_to_maven_depmap %{name} %{name}-ant %{version} JPP/%{name}/lib %{name}-ant
-%{__cp} -p %{SOURCE9} 
%{buildroot}%{_datadir}/maven2/poms/JPP.findbugs.plugin-coreplugin.pom
-%add_to_maven_depmap %{name} coreplugin %{version} JPP/%{name}/plugin 
coreplugin
-%{__cp} -p %{SOURCE10} 
%{buildroot}%{_datadir}/maven2/poms/JPP.findbugs.lib-jFormatString.pom
-%add_to_maven_depmap %{name} jFormatString %{version} JPP/%{name}/lib 
jFormatString
-
-%{__mkdir_p} %{buildroot}%{_bindir}
-%{__cp} -p %{SOURCE1} %{buildroot}%{_bindir}/%{name}
-
-%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
-# FIXME: (dwalluck): javadoc (openjdk6) throws NPE
-%{__cp} -pr apiJavaDoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} || :
-(cd %{buildroot}%{_javadocdir} && %{__ln_s} %{name}-%{version} %{name})
-
-%{__mkdir_p} %{buildroot}%{_datadir}/applications
-%{_bindir}/desktop-file-install --vendor jpackage --dir 
%{buildroot}%{_datadir}/applications %{SOURCE5}
-%{__install} -D -p -m 644 %{SOURCE2} 
%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-%{__install} -D -p -m 644 %{SOURCE3} 
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%{__install} -D -p -m 644 %{SOURCE4} 
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{__install} -D -p -m 644 %{SOURCE4} 
%{buildroot}%{_datadir}/pixmaps/%{name}.png
+# Build the architecture PDF
+#pushd design/architecture
+#make depend
+#make
+#popd
+
+# Package up the tools
+cd build/classes
+jar cf ../../lib/findbugs-tools.jar edu/umd/cs/findbugs/tools
 
-%{__mkdir_p} %{buildroot}%{_datadir}/%{name}-%{version}/bin
-%{__cp} -pr bin/* %{buildroot}%{_datadir}/%{name}-%{version}/bin/
-
-%if %{defined suse_version}
-%fdupes -s %{buildroot}
+%install
+# Install jars
+mkdir -p %{buildroot}%{_javadir}/
+cp lib/annotations.jar lib/%{name}-annotations.jar
+cp -p \
+    lib/%{name}.jar \
+    lib/%{name}-ant.jar \
+    lib/%{name}-annotations.jar \
+    lib/%{name}-tools.jar \
+%if %with bundled_jformatstring
+    lib/jFormatString.jar \
 %endif
+    %{buildroot}%{_javadir}/
 
-%post
-%update_maven_depmap
+# Install the ant task
+mkdir -p %{buildroot}%{_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
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name}
+
+# Install the javadocs
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
+cp -a apiJavaDoc $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
+  cp -p $f $RPM_BUILD_ROOT%{_bindir}
+done
+
+# Install the shared files
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -a etc plugin $RPM_BUILD_ROOT%{_datadir}/%{name}
+
+# Install poms
+mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+cp findbugs.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+cp annotations.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-annotations.pom
+
+# Add depmaps
+echo add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+echo add_maven_depmap JPP-%{name}-annotations.pom %{name}-annotations.jar
+%add_maven_depmap JPP-%{name}-annotations.pom %{name}-annotations.jar
+
+mkdir -p %{buildroot}%{_datadir}/applications
+install -D -p -m 644 %{SOURCE10} 
%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+install -D -p -m 644 %{SOURCE11} 
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -D -p -m 644 %{SOURCE12} 
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+install -D -p -m 644 %{SOURCE13} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
-%postun
-%update_maven_depmap
+%suse_update_desktop_file -i %{name}
+%fdupes -s %{buildroot}
 
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt README.txt design
-%dir %{_javadir}/%{name}
-%dir %{_javadir}/%{name}/lib
-%dir %{_javadir}/%{name}/plugin
-%dir %{_datadir}/%{name}-%{version}
-%dir %{_datadir}/%{name}-%{version}/bin
-%attr(0755,root,root) %{_bindir}/findbugs
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/addMessages
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/computeBugHistory
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/convertXmlToText
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/copyBuggySource
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/defectDensity
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/deprecated/bugHistory
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/deprecated/unionBugs
-%attr(0755,root,root) 
%{_datadir}/%{name}-%{version}/bin/deprecated/unionResults
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/deprecated/updateBugs
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/experimental/churn
-%attr(0755,root,root) 
%{_datadir}/%{name}-%{version}/bin/experimental/treemapVisualization
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/fbwrap
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/filterBugs
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/findbugs
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/findbugs2
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/findbugs-dbStats
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/findbugs-msv
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/listBugDatabaseInfo
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/mineBugHistory
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/printAppVersion
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/printClass
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/rejarForAnalysis
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/setBugDatabaseInfo
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/unionBugs
-%attr(0755,root,root) %{_datadir}/%{name}-%{version}/bin/xpathFind
+%attr(0755,root,root) %{_bindir}/*
+%{_datadir}/%{name}
 %dir %{_iconsdir}/hicolor/
 %{_iconsdir}/hicolor/16x16/apps/findbugs.png
 %{_iconsdir}/hicolor/32x32/apps/findbugs.png
 %{_iconsdir}/hicolor/48x48/apps/findbugs.png
-%{_javadir}/%{name}/lib/annotations-%{version}.jar
-%{_javadir}/%{name}/lib/annotations.jar
-%{_javadir}/%{name}/lib/asm-commons.jar
-%{_javadir}/%{name}/lib/asm-tree.jar
-%{_javadir}/%{name}/lib/asm.jar
-%{_javadir}/%{name}/lib/bcel5.3.jar
-%{_javadir}/%{name}/lib/commons-lang.jar
-%{_javadir}/%{name}/lib/dom4j.jar
-%{_javadir}/%{name}/lib/findbugs-%{version}.jar
-%{_javadir}/%{name}/lib/findbugs-ant-%{version}.jar
-%{_javadir}/%{name}/lib/findbugs-ant.jar
-%{_javadir}/%{name}/lib/findbugs.jar
-%{_javadir}/%{name}/lib/jFormatString.jar
-%{_javadir}/%{name}/lib/jaxen.jar
-%{_javadir}/%{name}/lib/jcip-annotations.jar
-%{_javadir}/%{name}/lib/jsr-305.jar
-%doc %{_javadir}/%{name}/plugin/README
-%{_datadir}/maven2/poms/JPP.findbugs.lib-annotations.pom
-%{_datadir}/maven2/poms/JPP.findbugs.lib-findbugs-ant.pom
-%{_datadir}/maven2/poms/JPP.findbugs.lib-findbugs.pom
-%{_datadir}/maven2/poms/JPP.findbugs.lib-jFormatString.pom
-%{_datadir}/maven2/poms/JPP.findbugs.plugin-coreplugin.pom
+%{_mavenpomdir}/*
 %config %{_mavendepmapfragdir}/%{name}
-%config %{_sysconfdir}/ant.d/%{name}
 %{_datadir}/applications/*%{name}.desktop
-#%{_datadir}/icons/*/*/apps/*
 %{_datadir}/pixmaps/%{name}.png
-%if %{defined suse_version}
-%dir %{_datadir}/%{name}-%{version}/bin/deprecated
-%dir %{_datadir}/%{name}-%{version}/bin/experimental
-%dir %{_datadir}/icons/hicolor
-%endif
+%{_javadir}/%{name}.jar
+%{_javadir}/%{name}-annotations.jar
 
-%files javadoc
+%files -n ant-findbugs
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
+%doc LICENSE.txt
+%{_javadir}/ant/*
+%config(noreplace) %{_sysconfdir}/ant.d/%{name}
+%{_javadir}/%{name}-ant.jar
 
-%files manual
+%files javadoc
 %defattr(0644,root,root,0755)
 %doc README.manual
+%{_javadocdir}/%{name}
+
+%files tools
+%doc LICENSE.txt README.tools
+%{_javadir}/findbugs-tools*
 
 %changelog

++++++ findbugs-annotations-1.3.9.pom -> annotations-1.3.2.pom ++++++
--- /work/SRC/openSUSE:Factory/findbugs/findbugs-annotations-1.3.9.pom  
2011-09-23 01:57:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.findbugs.new/annotations-1.3.2.pom      
2013-09-11 13:39:54.000000000 +0200
@@ -1,12 +1,22 @@
 <project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>findbugs</groupId>
-  <artifactId>annotations</artifactId>
-  <version>1.3.9</version>
-  <url>http://findbugs.sf.net</url>
-  <description>Annotation supports the FindBugs tool</description>
-  <scm>
-    
<connection>scm:cvs:pserver:[email protected]:/cvsroot/findbugs/findbugs</connection>
-  </scm>
-
+       <modelVersion>4.0.0</modelVersion>
+       <groupId>net.sourceforge.findbugs</groupId>
+       <artifactId>annotations</artifactId>
+       <version>1.3.2</version>
+       <packaging>jar</packaging>
+       <url>http://findbugs.sourceforge.net/</url>
+       <name>FindBugs-Annotations</name>
+       <description>Annotation supports the FindBugs tool</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>
 </project>

++++++ findbugs-1.3.9.pom -> findbugs-1.3.7.pom ++++++
--- /work/SRC/openSUSE:Factory/findbugs/findbugs-1.3.9.pom      2011-09-23 
01:57:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.findbugs.new/findbugs-1.3.7.pom 2013-09-11 
13:39:54.000000000 +0200
@@ -1,41 +1,74 @@
-<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>findbugs</groupId>
-  <artifactId>findbugs</artifactId>
-  <version>1.3.9</version>
-  <url>http://findbugs.sf.net</url>
-  <description>Findbugs: Because it's easy!</description>
-  <scm>
-    
<connection>scm:cvs:pserver:[email protected]:/cvsroot/findbugs/findbugs</connection>
-  </scm>
-
-    <dependencies>
-      <dependency>
-        <groupId>findbugs</groupId>
-        <artifactId>annotations</artifactId>
-        <version>1.3.9</version>
-      </dependency>
-      <dependency>
-        <groupId>findbugs</groupId>
-        <artifactId>bcel</artifactId>
-        <version>5.2</version>
-      </dependency>
-      <dependency>
-        <groupId>findbugs</groupId>
-        <artifactId>coreplugin</artifactId>
-        <version>1.3.9</version>
-      </dependency>
-      <dependency>
-        <groupId>findbugs</groupId>
-        <artifactId>findbugs-ant</artifactId>
-        <version>1.3.9</version>
-      </dependency>
-      <dependency>
-        <groupId>findbugs</groupId>
-        <artifactId>findbugsGUI</artifactId>
-        <version>1.3.9</version>
-      </dependency>
-    </dependencies>
-
+<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>net.sourceforge.findbugs</groupId>
+       <artifactId>findbugs</artifactId>
+       <version>1.3.7</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>net.sourceforge.findbugs</groupId>
+                       <artifactId>jFormatString</artifactId>
+                       <version>1.3.7</version>
+               </dependency>
+               <dependency>
+                       <groupId>net.sourceforge.findbugs</groupId>
+                       <artifactId>jsr305</artifactId>
+                       <version>1.3.7</version>
+               </dependency>
+               <dependency>
+                       <groupId>net.sourceforge.findbugs</groupId>
+                       <artifactId>bcel</artifactId>
+                       <version>1.3.7</version>
+               </dependency>
+               <dependency>
+                       <groupId>dom4j</groupId>
+                       <artifactId>dom4j</artifactId>
+                       <version>1.6.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>asm</groupId>
+                       <artifactId>asm</artifactId>
+                       <version>3.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>asm</groupId>
+                       <artifactId>asm-analysis</artifactId>
+                       <version>3.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>asm</groupId>
+                       <artifactId>asm-commons</artifactId>
+                       <version>3.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>asm</groupId>
+                       <artifactId>asm-util</artifactId>
+                       <version>3.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>asm</groupId>
+                       <artifactId>asm-tree</artifactId>
+                       <version>3.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>asm</groupId>
+                       <artifactId>asm-xml</artifactId>
+                       <version>3.1</version>
+               </dependency>
+       </dependencies>
 </project>

++++++ findbugs-1.3.9-build.patch ++++++
diff -dur findbugs-1.3.9.ORIG/build.xml findbugs-1.3.9/build.xml
--- findbugs-1.3.9.ORIG/build.xml       2009-08-04 20:26:50.000000000 -0600
+++ findbugs-1.3.9/build.xml    2009-08-25 11:31:55.848947432 -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,23 +57,24 @@
        <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-1.6.1.jar"/>
+               <pathelement location="${systemjar.dir}/junit4.jar"/>
+               <pathelement 
location="${systemjar.dir}/objectweb-asm/asm-3.1.jar"/>
+               <pathelement 
location="${systemjar.dir}/objectweb-asm/asm-commons-3.1.jar"/>
+               <pathelement 
location="${systemjar.dir}/objectweb-asm/asm-tree-3.1.jar"/>
+               <pathelement location="${systemjar.dir}/jaxen-1.1.1.jar"/>      
        
+               <pathelement location="${systemjar.dir}/jsr-305.jar"/>
+               <pathelement location="${systemjar.dir}/jFormatString.jar"/>
+               <pathelement location="${systemjar.dir}/commons-lang.jar"/>
+               <pathelement location="${systemjar.dir}/jcip-annotations.jar"/>
+               <pathelement location="${systemjar.dir}/ant.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-2.9.1.jar"/>
                <path refid="findbugs.classpath"/>
        </path>
 
@@ -1047,7 +1050,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-1.6.1.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.9.ORIG/design/architecture/Makefile 
findbugs-1.3.9/design/architecture/Makefile
--- findbugs-1.3.9.ORIG/design/architecture/Makefile    2006-01-10 
14:34:32.000000000 -0700
+++ findbugs-1.3.9/design/architecture/Makefile 2009-08-25 11:31:27.204143518 
-0600
@@ -4,6 +4,7 @@
 %.pdf : %.tex
        pdflatex $*
        pdflatex $*
+       pdflatex $*
 
 all : $(PDFS)
 
diff -dur findbugs-1.3.9.ORIG/etc/MANIFEST-findbugs.MF 
findbugs-1.3.9/etc/MANIFEST-findbugs.MF
--- findbugs-1.3.9.ORIG/etc/MANIFEST-findbugs.MF        2009-06-13 
11:10:40.000000000 -0600
+++ findbugs-1.3.9/etc/MANIFEST-findbugs.MF     2009-08-25 11:31:27.205158785 
-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 mysql-connector-java-5.1.7-bin.jar
+Class-Path: findbugs-bcel.jar dom4j-1.6.1.jar jaxen-1.1.1.jar 
objectweb-asm/asm-3.1.jar objectweb-asm/asm-tree-3.1.jar 
objectweb-asm/asm-commons-3.1.jar jsr-305.jar jFormatString.jar commons-lang.jar
diff -dur findbugs-1.3.9.ORIG/etc/script.properties 
findbugs-1.3.9/etc/script.properties
--- findbugs-1.3.9.ORIG/etc/script.properties   2008-03-18 16:54:34.000000000 
-0600
+++ findbugs-1.3.9/etc/script.properties        2009-08-25 11:31:27.205158785 
-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.9.ORIG/src/scripts/standard/findbugs 
findbugs-1.3.9/src/scripts/standard/findbugs
--- findbugs-1.3.9.ORIG/src/scripts/standard/findbugs   2008-07-02 
11:48:10.000000000 -0600
+++ findbugs-1.3.9/src/scripts/standard/findbugs        2009-08-25 
11:31:27.206143760 -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.9.ORIG/src/scripts/standard/findbugs2 
findbugs-1.3.9/src/scripts/standard/findbugs2
--- findbugs-1.3.9.ORIG/src/scripts/standard/findbugs2  2009-07-31 
10:23:38.000000000 -0600
+++ findbugs-1.3.9/src/scripts/standard/findbugs2       2009-08-25 
11:31:27.207327673 -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 \
        ${@:+"$@"}
++++++ findbugs-1.3.9-pom.patch ++++++
diff -ur old/annotations.pom new/annotations.pom
--- old/annotations.pom 2012-03-18 16:36:12.849721722 +0000
+++ new/annotations.pom 2012-03-18 16:42:53.945040770 +0000
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>net.sourceforge.findbugs</groupId>
        <artifactId>annotations</artifactId>
-       <version>1.3.2</version>
+       <version>1.3.9</version>
        <packaging>jar</packaging>
        <url>http://findbugs.sourceforge.net/</url>
        <name>FindBugs-Annotations</name>
diff -ur old/findbugs.pom new/findbugs.pom
--- old/findbugs.pom    2012-03-18 16:36:12.850721723 +0000
+++ new/findbugs.pom    2012-03-18 16:43:21.457062653 +0000
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>net.sourceforge.findbugs</groupId>
        <artifactId>findbugs</artifactId>
-       <version>1.3.7</version>
+       <version>1.3.9</version>
        <packaging>jar</packaging>
        <url>http://findbugs.sourceforge.net/</url>
        <name>FindBugs</name>
@@ -23,17 +23,17 @@
                <dependency>
                        <groupId>net.sourceforge.findbugs</groupId>
                        <artifactId>jFormatString</artifactId>
-                       <version>1.3.7</version>
+                       <version>1.3.9</version>
                </dependency>
                <dependency>
                        <groupId>net.sourceforge.findbugs</groupId>
                        <artifactId>jsr305</artifactId>
-                       <version>1.3.7</version>
+                       <version>1.3.9</version>
                </dependency>
                <dependency>
                        <groupId>net.sourceforge.findbugs</groupId>
                        <artifactId>bcel</artifactId>
-                       <version>1.3.7</version>
+                       <version>1.3.9</version>
                </dependency>
                <dependency>
                        <groupId>dom4j</groupId>



++++++ findbugs-ant ++++++
findbugs ant/ant-findbugs commons-lang dom4j findbugs-bcel jaxen
jcip-annotations jFormatString jsr-305 junit4 objectweb-asm/asm
objectweb-asm/asm-commons objectweb-asm/asm-tree
++++++ findbugs-asm-version.patch ++++++
diff -ur findbugs-1.3.9-ORIGINAL/build.xml findbugs-1.3.9/build.xml
--- findbugs-1.3.9-ORIGINAL/build.xml   2011-06-27 21:39:26.000000000 +0100
+++ findbugs-1.3.9/build.xml    2011-06-27 21:41:09.000000000 +0100
@@ -60,9 +60,9 @@
                <pathelement location="${systemjar.dir}/findbugs-bcel.jar"/>
                <pathelement location="${systemjar.dir}/dom4j-1.6.1.jar"/>
                <pathelement location="${systemjar.dir}/junit4.jar"/>
-               <pathelement 
location="${systemjar.dir}/objectweb-asm/asm-3.1.jar"/>
-               <pathelement 
location="${systemjar.dir}/objectweb-asm/asm-commons-3.1.jar"/>
-               <pathelement 
location="${systemjar.dir}/objectweb-asm/asm-tree-3.1.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-1.1.1.jar"/>      
        
                <pathelement location="${systemjar.dir}/jsr-305.jar"/>
                <pathelement location="${systemjar.dir}/jFormatString.jar"/>
diff -ur findbugs-1.3.9-ORIGINAL/etc/MANIFEST-findbugs.MF 
findbugs-1.3.9/etc/MANIFEST-findbugs.MF
--- findbugs-1.3.9-ORIGINAL/etc/MANIFEST-findbugs.MF    2011-06-27 
21:39:26.000000000 +0100
+++ findbugs-1.3.9/etc/MANIFEST-findbugs.MF     2011-06-27 21:40:52.000000000 
+0100
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
 Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
-Class-Path: findbugs-bcel.jar dom4j-1.6.1.jar jaxen-1.1.1.jar 
objectweb-asm/asm-3.1.jar objectweb-asm/asm-tree-3.1.jar 
objectweb-asm/asm-commons-3.1.jar jsr-305.jar jFormatString.jar commons-lang.jar
+Class-Path: findbugs-bcel.jar dom4j-1.6.1.jar jaxen-1.1.1.jar 
objectweb-asm/asm.jar objectweb-asm/asm-tree.jar objectweb-asm/asm-commons.jar 
jsr-305.jar jFormatString.jar commons-lang.jar
++++++ findbugs-home.patch ++++++
diff -ur findbugs-1.3.9-ORIGINAL/etc/script.properties 
findbugs-1.3.9/etc/script.properties
--- findbugs-1.3.9-ORIGINAL/etc/script.properties       2012-08-16 
20:11:04.169075637 +0100
+++ findbugs-1.3.9/etc/script.properties        2012-08-16 20:12:41.334188169 
+0100
@@ -31,7 +31,7 @@
        fi\n\
        \n\
        # Make absolute\n\
-       findbugs_home=`cd "$findbugs_home" && pwd`\n\
+       findbugs_home=`cd -P "$findbugs_home" && pwd`\n\
        \n\
        fb_pathsep=':'\n\
        \n\
++++++ findbugs-jar-filenames.patch ++++++
diff -ur findbugs-1.3.9-ORIGINAL/build.xml findbugs-1.3.9/build.xml
--- findbugs-1.3.9-ORIGINAL/build.xml   2012-07-28 18:19:37.697925429 +0100
+++ findbugs-1.3.9/build.xml    2012-07-28 18:20:09.362968800 +0100
@@ -58,15 +58,15 @@
        
        <path id="findbugs.classpath">
                <pathelement location="${systemjar.dir}/findbugs-bcel.jar"/>
-               <pathelement location="${systemjar.dir}/dom4j-1.6.1.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-1.1.1.jar"/>      
        
+               <pathelement location="${systemjar.dir}/jaxen.jar"/>            
                <pathelement location="${systemjar.dir}/jsr-305.jar"/>
                <pathelement location="${systemjar.dir}/jFormatString.jar"/>
-               <pathelement location="${systemjar.dir}/commons-lang.jar"/>
+               <pathelement location="${systemjar.dir}/commons-lang.jar"/>
                <pathelement location="${systemjar.dir}/jcip-annotations.jar"/>
                <pathelement location="${systemjar.dir}/ant.jar"/>
        </path>
@@ -74,7 +74,7 @@
        <path id="tools.classpath">
                <pathelement location="${classes.dir}"/>
                <pathelement location="${jar.dir}/findbugs.jar"/>
-               <pathelement location="${systemjar.dir}/jdepend-2.9.1.jar"/>
+               <pathelement location="${systemjar.dir}/jdepend.jar"/>
                <path refid="findbugs.classpath"/>
        </path>
 
diff -ur findbugs-1.3.9-ORIGINAL/etc/MANIFEST-findbugs.MF 
findbugs-1.3.9/etc/MANIFEST-findbugs.MF
--- findbugs-1.3.9-ORIGINAL/etc/MANIFEST-findbugs.MF    2012-07-28 
18:19:37.697925429 +0100
+++ findbugs-1.3.9/etc/MANIFEST-findbugs.MF     2012-07-28 18:23:54.275270153 
+0100
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
 Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
-Class-Path: findbugs-bcel.jar dom4j-1.6.1.jar jaxen-1.1.1.jar 
objectweb-asm/asm.jar objectweb-asm/asm-tree.jar objectweb-asm/asm-commons.jar 
jsr-305.jar jFormatString.jar commons-lang.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 
jFormatString.jar commons-lang.jar
++++++ findbugs-remove-classpath.patch ++++++
diff -ur findbugs-1.3.9-ORIGINAL/etc/script.properties 
findbugs-1.3.9/etc/script.properties
--- findbugs-1.3.9-ORIGINAL/etc/script.properties       2012-07-28 
22:30:00.767724162 +0100
+++ findbugs-1.3.9/etc/script.properties        2012-07-28 23:05:37.476928168 
+0100
@@ -94,10 +94,15 @@
        fb_javacmd=\${fb_javacmd:-"java"}\n\
        fb_maxheap=\${fb_maxheap:-"-Xmx584m"}\n\
        fb_appjar=\${fb_appjar:-"/usr/share/java/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 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 -ur findbugs-1.3.9-ORIGINAL/src/scripts/standard/findbugs2 
findbugs-1.3.9/src/scripts/standard/findbugs2
--- findbugs-1.3.9-ORIGINAL/src/scripts/standard/findbugs2      2012-07-28 
22:30:00.768724163 +0100
+++ findbugs-1.3.9/src/scripts/standard/findbugs2       2012-07-28 
23:35:01.750499860 +0100
@@ -109,13 +109,19 @@
                -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 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 /usr/share/java/findbugs.jar \
+       $fb_mainclass \
        ${@:+"$@"}
++++++ findbugs-tools-README ++++++
This package contains additional tools for use with findbugs.  They include:
* edu.umd.cs.findbugs.tools.FixIndentation <file>: reindents a Java file
* edu.umd.cs.findbugs.tools.FilterPropertyDatabase <file>: filters a property
  database, only passing through the annotations on public or protected
  methods
* edu.umd.cs.findbugs.tools.html.PlainPrintBugDescriptions [docTitle]:
  prints findbugs bug descriptions as plain text
* edu.umd.cs.findbugs.tools.html.PrettyPrintBugDescriptions [-unabridged]
  [docTitle]: prints findbugs bug descriptions as HTML.  If the -unabridged
  option is given, then warnings from disabled detectors are also printed.
* edu.umd.cs.findbugs.tools.junit.JUnitJarRunner [-textui|-swingui]
  <test suite jar file> [<classpath with code to test>]: run all of the JUnit
  tests in a jar file.
* edu.umd.cs.findbugs.tools.xml.CheckMessages <plugin descriptor xml>
  <bug description xml> [<bug description xml> ...]: check the XML message
  files in a findbugs plugin for validity and completeness.
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to