rpms/findbugs-contrib/F-10 findbugs-contrib-3.8.1-build.patch, NONE, 1.1 findbugs-contrib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Jerry James]

Author: jjames

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

Modified Files:
	.cvsignore sources 
Added Files:
	findbugs-contrib-3.8.1-build.patch findbugs-contrib.spec 
Log Message:
Initial checkin to the F-10 and F-11 branches.


findbugs-contrib-3.8.1-build.patch:

--- NEW FILE findbugs-contrib-3.8.1-build.patch ---
diff -dur fb-contrib-3.8.1.ORIG/build.properties fb-contrib-3.8.1/build.properties
--- fb-contrib-3.8.1.ORIG/build.properties	2007-02-14 01:43:56.000000000 -0700
+++ fb-contrib-3.8.1/build.properties	2009-03-18 15:28:12.000000000 -0600
@@ -1 +1 @@
-jdk14.home=C:/j2sdk1.4.2_13
\ No newline at end of file
+jdk14.home=/etc/alternatives/java
diff -dur fb-contrib-3.8.1.ORIG/build.xml fb-contrib-3.8.1/build.xml
--- fb-contrib-3.8.1.ORIG/build.xml	2009-03-15 23:56:22.000000000 -0600
+++ fb-contrib-3.8.1/build.xml	2009-03-18 15:30:07.000000000 -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}/findbugs-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"/>
@@ -188,4 +189,4 @@
 	
 	<target name="release" depends="build, check14, srczip, html, javadoc" description="prepares everything for a release"/>
 
-</project>
\ No newline at end of file
+</project>


--- NEW FILE findbugs-contrib.spec ---
%global plugin_dir %{_datadir}/findbugs/plugin
%global eclipse_plugin_vers 1.3.8
%global eclipse_plugin_date 20090315
%global eclipse_plugins_dir %{_datadir}/eclipse/dropins/findbugs/plugins
%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:        2%{?dist}
Summary:        Extra findbugs detectors

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

BuildRequires:  ant, findbugs, java-1.6.0-openjdk-devel, jpackage-utils, jsp
BuildRequires:  junit4, log4j, servlet
Requires:       findbugs, java-1.6.0-openjdk, jpackage-utils

%description
This is an extra detector plugin to be used with the static bug finder
FindBugs.  See the documentation for descriptions of the detectors.

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

%description javadoc
Javadoc documentation for %{name}.

%package samples
Group:          Development/Languages
Summary:        Sample input files illustrating the detectors
Requires:       %{name} = %{version}-%{release}, jsp, junit4, log4j, servlet

%description samples
This package contains sample input files that illustrate the various findbugs
detectors.

%package -n eclipse-findbugs-contrib
Group:          Development/Languages
Summary:        Eclipse plugin for findbugs-contrib
Requires:       %{name} = %{version}-%{release}
Requires:       eclipse-findbugs = %{eclipse_plugin_vers}

%description -n eclipse-findbugs-contrib
This package integrates the findbugs-contrib detectors into Eclipse, in
addition to the base findbugs detectors.

%prep
%setup -q -c
%patch0 -p1

# Remove the precompiled files
rm -fr classes/com fb-contrib-*.jar fb-contrib-src-*.zip plugin lib/*
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

%install
rm -rf $RPM_BUILD_ROOT

# Install the plugin
mkdir -p $RPM_BUILD_ROOT%{plugin_dir}
cp -p fb-contrib-%{version}.jar $RPM_BUILD_ROOT%{plugin_dir}

# Install the documentation
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/fb-contrib-%{version}
cp -a javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/fb-contrib-%{version}
ln -s fb-contrib-%{version} $RPM_BUILD_ROOT%{_javadocdir}/fb-contrib

# Make a soft link for eclipse
mkdir -p $RPM_BUILD_ROOT%{eclipse_plugin_dir}
ln -s %{plugin_dir}/fb-contrib-%{version}.jar \
  $RPM_BUILD_ROOT%{eclipse_plugin_dir}/fb-contrib-%{version}.jar

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc license.txt htdocs/*
%{plugin_dir}/fb-contrib-%{version}.jar

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

%files samples
%defattr(-,root,root,-)
%doc samples/*

%files -n eclipse-findbugs-contrib
%defattr(-,root,root,-)
%{eclipse_plugin_dir}/fb-contrib-%{version}.jar

%changelog
* Thu May 28 2009 Jerry James <loganjerry at gmail.com> - 3.8.1-2
- Add eclipse-findbugs-contrib package as suggested by Alexander Kurtakov

* Tue Apr  7 2009 Jerry James <loganjerry at gmail.com> - 3.8.1-1
- Initial RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	5 Jun 2009 22:07:58 -0000	1.1
+++ .cvsignore	6 Jun 2009 04:10:20 -0000	1.2
@@ -0,0 +1 @@
+fb-contrib-src-3.8.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/findbugs-contrib/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	5 Jun 2009 22:07:58 -0000	1.1
+++ sources	6 Jun 2009 04:10:20 -0000	1.2
@@ -0,0 +1 @@
+66cd1813ee1d4b12321b43435694e5c1  fb-contrib-src-3.8.1.zip