rpms/findbugs/F-10 findbugs-1.3.7-build.patch, NONE, 1.1 findbugs-ant, NONE, 1.1 findbugs-tools-README, NONE, 1.1 findbugs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Wed Mar 11 01:55:08 UTC 2009

Author: jjames

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

Modified Files:
	.cvsignore sources 
Added Files:
	findbugs-1.3.7-build.patch findbugs-ant findbugs-tools-README 
	findbugs.spec 
Log Message:
New package.


findbugs-1.3.7-build.patch:

--- NEW FILE findbugs-1.3.7-build.patch ---
diff -dur findbugs-1.3.7.ORIG/build.xml findbugs-1.3.7/build.xml
--- findbugs-1.3.7.ORIG/build.xml	2008-12-30 10:32:30.000000000 -0700
+++ findbugs-1.3.7/build.xml	2009-01-02 16:18:23.000000000 -0700
@@ -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"/>
@@ -57,17 +59,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">
@@ -972,7 +975,7 @@
       <javadoc access="protected" 
        author="true" 
 	    packagenames="*"
-       classpath="lib/bcel.jar:lib/junit.jar:lib/dom4j-1.6.1.jar:lib/asm-3.1.jar:lib/asm-tree-3.1.jar:lib/asm-commons-3.1.jar:lib/jsr305.jar:lib/AppleJavaExtensions.jar"
+       classpath="${systemjar.dir}/findbugs-bcel.jar:${systemjar.dir}/junit4.jar:${systemjar.dir}/dom4j.jar:${systemjar.dir}/objectweb-asm/asm.jar:${systemjar.dir}/objectweb-asm/asm-tree.jar:${systemjar.dir}/objectweb-asm/asm-commons.jar:${systemjar.dir}/jsr-305.jar:${systemjar.dir}/jcip-annotations.jar:${systemjar.dir}/ant.jar:${systemjar.dir}/jFormatString.jar:${systemjar.dir}/commons-lang.jar"
         destdir="${apiDoc.dir}" 
         doctitle="FindBugs API Documentation" 
         Header="<b>FindBugs&trade; ${release.number}</b>"
@@ -986,7 +989,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.7.ORIG/design/architecture/Makefile findbugs-1.3.7/design/architecture/Makefile
--- findbugs-1.3.7.ORIG/design/architecture/Makefile	2006-01-10 14:34:32.000000000 -0700
+++ findbugs-1.3.7/design/architecture/Makefile	2009-01-02 16:18:23.000000000 -0700
@@ -4,6 +4,7 @@
 %.pdf : %.tex
 	pdflatex $*
 	pdflatex $*
+	pdflatex $*
 
 all : $(PDFS)
 
diff -dur findbugs-1.3.7.ORIG/etc/MANIFEST-findbugs.MF findbugs-1.3.7/etc/MANIFEST-findbugs.MF
--- findbugs-1.3.7.ORIG/etc/MANIFEST-findbugs.MF	2008-10-02 17:13:14.000000000 -0600
+++ findbugs-1.3.7/etc/MANIFEST-findbugs.MF	2009-01-02 16:18:23.000000000 -0700
@@ -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.7.ORIG/etc/script.properties findbugs-1.3.7/etc/script.properties
--- findbugs-1.3.7.ORIG/etc/script.properties	2008-03-18 16:54:34.000000000 -0600
+++ findbugs-1.3.7/etc/script.properties	2009-01-02 16:18:23.000000000 -0700
@@ -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.7.ORIG/src/scripts/standard/findbugs findbugs-1.3.7/src/scripts/standard/findbugs
--- findbugs-1.3.7.ORIG/src/scripts/standard/findbugs	2008-07-02 11:48:10.000000000 -0600
+++ findbugs-1.3.7/src/scripts/standard/findbugs	2009-01-02 16:18:23.000000000 -0700
@@ -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.7.ORIG/src/scripts/standard/findbugs2 findbugs-1.3.7/src/scripts/standard/findbugs2
--- findbugs-1.3.7.ORIG/src/scripts/standard/findbugs2	2008-07-02 12:16:14.000000000 -0600
+++ findbugs-1.3.7/src/scripts/standard/findbugs2	2009-01-02 16:18:23.000000000 -0700
@@ -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 \
 	${@:+"$@"}


--- NEW FILE 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


--- NEW FILE 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.


--- NEW FILE findbugs.spec ---
# GCJ note: findbugs currenly 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.7
Release:        4%{?dist}
Summary:        Find bugs in Java code

Group:          Development/Languages
License:        LGPLv2+
URL:            http://findbugs.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.zip
Source1:        findbugs-ant
Source2:        findbugs-tools-README
# 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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  findbugs-bcel
BuildRequires:  ant
BuildRequires:  docbook-style-xsl
BuildRequires:  jakarta-commons-lang
BuildRequires:  java-devel
BuildRequires:  jaxen
BuildRequires:  jcip-annotations
BuildRequires:  jFormatString
BuildRequires:  jpackage-utils
BuildRequires:  jsr-305
BuildRequires:  junit4
BuildRequires:  objectweb-asm
BuildRequires:  perl
BuildRequires:  tex(latex)
Requires:       findbugs-bcel
Requires:       jakarta-commons-lang
Requires:       java
Requires:       jaxen
Requires:       jcip-annotations
Requires:       jFormatString
Requires:       jpackage-utils
Requires:       jsr-305
Requires:       junit4
Requires:       objectweb-asm

%description
Findbugs is a program which uses static analysis to look for bugs in Java code.
It can check for null pointer exceptions, multithreaded code errors, and other
bugs.

%package -n ant-findbugs
Group:          Development/Build Tools
Summary:        Ant task for findbugs
Requires:       %{name} = %{version}-%{release}
Requires:       ant

%description -n ant-findbugs
This package defines an ant task for findbugs for easy integration of findbugs
into your ant-controlled project.

%package javadoc
Group:          Development/Documentation
Summary:        Javadoc documentation for findbugs
Requires:       %{name} = %{version}-%{release}

%description javadoc
Javadoc documentation for findbugs.

%package tools
Group:          Development/Languages
Summary:        Addon tools for findbugs
Requires:       %{name} = %{version}-%{release}
Requires:       junit4

%description tools
This package contains additional tools for use with findbugs.  See
README.fedora for more information.

%prep
%setup -q
%patch0 -p1

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

# Turn on the executable bits for some auxiliary scripts
chmod a+x etc/summarizeBugs etc/diffBugSummaries design/architecture/mkdep.pl

%build
# Build the class files
ant

# Build the javadocs
ant apiJavadoc

# 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

%install
rm -rf $RPM_BUILD_ROOT

# 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

# 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
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}-%{version}
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
  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}

# Remove now unnecessary build-only manual files so %%doc doesn't get them
rm -f doc/manual*.xml doc/manual*.xsl

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc 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.jar

%files -n ant-findbugs
%defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadir}/ant/*
%config(noreplace) %{_sysconfdir}/ant.d/%{name}

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/*

%files tools
%defattr(-,root,root,-)
%doc LICENSE.txt README.fedora
%{_javadir}/findbugs-tools*

%changelog
* Fri Mar  6 2009 Jerry James <loganjerry at gmail.com> - 1.3.7-4
- Add README.fedora to the -tools package

* Thu Mar  5 2009 Jerry James <loganjerry at gmail.com> - 1.3.7-3
- Minor spec file cleanups from review

* Tue Feb 10 2009 Jerry James <loganjerry at gmail.com> - 1.3.7-2
- Rebuild for dependencies

* Fri Jan  2 2009 Jerry James <loganjerry at gmail.com> - 1.3.7-1
- Update to 1.3.7

* Tue Dec  9 2008 Jerry James <loganjerry at gmail.com> - 1.3.6-1
- Update to 1.3.6

* Fri Sep 19 2008 Jerry James <loganjerry at gmail.com> - 1.3.5-1
- Initial RPM


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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Mar 2009 20:11:20 -0000	1.1
+++ sources	11 Mar 2009 01:54:37 -0000	1.2
@@ -0,0 +1 @@
+ae5ee33e7c07031cdec22c1da5e59b93  findbugs-1.3.7-source.zip


