rpms/eclipse-findbugs/devel eclipse-findbugs.spec, NONE, 1.1 eclipsePlugin-1.3.7-build.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Jerry James jjames at fedoraproject.org
Wed Mar 11 20:14:04 UTC 2009


Author: jjames

Update of /cvs/pkgs/rpms/eclipse-findbugs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4510/devel

Modified Files:
	.cvsignore sources 
Added Files:
	eclipse-findbugs.spec eclipsePlugin-1.3.7-build.patch 
	import.log 
Log Message:
New package: Eclipse plugin for findbugs.



--- NEW FILE eclipse-findbugs.spec ---
%global eclipse_base %{_libdir}/eclipse
%global pkg_date     20081230

Name:           eclipse-findbugs
Version:        1.3.7
Release:        3%{?dist}
Summary:        Eclipse plugin for FindBugs

Group:          Development/Languages
License:        LGPLv2+
URL:            http://findbugs.sourceforge.net/
Source0:        http://downloads.sourceforge.net/findbugs/eclipsePlugin-%{version}.%{pkg_date}-source.zip
# This patch is Fedora-specific, so it has not been submitted upstream.  The
# patch makes the build infrastructure use installed JARs for the build, rather
# than downloading JARs.
Patch0:         eclipsePlugin-%{version}-build.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant, ant-findbugs, eclipse-pde, findbugs
BuildRequires:  java-devel >= 1.5, jpackage-utils
Requires:       ant, ant-findbugs, eclipse-rcp, findbugs
Requires:       java >= 1.5, jpackage-utils

BuildArch:      noarch

%global plugins_dir %{_datadir}/eclipse/dropins/findbugs/plugins
%global plugin_dir  %{plugins_dir}/edu.umd.cs.findbugs.plugin.eclipse_%{version}.%{pkg_date}

%description
An Eclipse plugin for the FindBugs Java bug detector.

%prep
%setup -q -n eclipsePlugin-%{version}.%{pkg_date}
%patch0 -p1

# Set up the eclipse paths
sed -i -e 's|@SWT_JAR@|%{eclipse_base}/swt.jar|' build.xml

# Make sure we don't use retroweaver
rm -fr tools

%build
# If we don't specify plugin.version, it becomes the current date!
ant -DeclipsePlugin.dir=%{eclipse_base}/plugins \
    -DeclipseJdtPlugin.dir=%{eclipse_base}/dropins/jdt/plugins \
    -DeclipseSdkPlugin.dir=%{eclipse_base}/dropins/sdk/plugins \
    -Dplugin.version=%{version}.%{pkg_date} \
  dist

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{plugins_dir}
unzip -q -d $RPM_BUILD_ROOT%{plugins_dir} \
  bin_build/edu.umd.cs.findbugs.plugin.eclipse_%{version}.%{pkg_date}.zip

# Symlink to the external jars we need
%define javalink ../../../../../java
ln -s %{javalink}/ant.jar $RPM_BUILD_ROOT%{plugin_dir}
ln -s %{javalink}/ant/ant-findbugs.jar $RPM_BUILD_ROOT%{plugin_dir}
ln -s %{javalink}/commons-lang.jar $RPM_BUILD_ROOT%{plugin_dir}
ln -s %{javalink}/dom4j.jar $RPM_BUILD_ROOT%{plugin_dir}
ln -s %{javalink}/findbugs-bcel.jar $RPM_BUILD_ROOT%{plugin_dir}
ln -s %{javalink}/findbugs.jar $RPM_BUILD_ROOT%{plugin_dir}
ln -s %{javalink}/jaxen.jar $RPM_BUILD_ROOT%{plugin_dir}
ln -s %{javalink}/jcip-annotations.jar $RPM_BUILD_ROOT%{plugin_dir}
ln -s %{javalink}/jFormatString.jar $RPM_BUILD_ROOT%{plugin_dir}
ln -s %{javalink}/jsr-305.jar $RPM_BUILD_ROOT%{plugin_dir}
ln -s %{javalink}/objectweb-asm/asm-tree.jar $RPM_BUILD_ROOT%{plugin_dir}
ln -s %{javalink}/objectweb-asm/asm.jar $RPM_BUILD_ROOT%{plugin_dir}
ln -s %{javalink}/objectweb-asm/asm-commons.jar $RPM_BUILD_ROOT%{plugin_dir}

# Remove one unnecessary file (used at build-time only)
rm -f $RPM_BUILD_ROOT%{plugin_dir}/.options

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc RELEASENOTES
%{plugin_dir}

%changelog
* Fri Mar  6 2009 Jerry James <loganjerry at gmail.com> - 1.3.7-3
- Fix spec file problems discovered in review

* Tue Feb 10 2009 Jerry James <loganjerry at gmail.com> - 1.3.7-2
- Adapt to latest Eclipse plugin guidelines

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

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

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

eclipsePlugin-1.3.7-build.patch:

--- NEW FILE eclipsePlugin-1.3.7-build.patch ---
diff -dur eclipsePlugin-1.3.7.20081230.ORIG/build.properties eclipsePlugin-1.3.7.20081230/build.properties
--- eclipsePlugin-1.3.7.20081230.ORIG/build.properties	2008-10-13 23:45:56.000000000 -0600
+++ eclipsePlugin-1.3.7.20081230/build.properties	2009-01-02 22:08:30.000000000 -0700
@@ -4,11 +4,11 @@
 			   about.html,\
 			   about.ini,\
 			   about.properties,\
-			   annotations.jar,\
-			   bcel.jar,\
-			   jsr305.jar,\
+			   /usr/share/java/finbugs-annotations.jar,\
+			   /usr/share/java/findbugs-bcel.jar,\
+			   /usr/share/java/jsr-305.jar,\
 			   findbugs-plugin.jar,\
-			   findbugs.jar,\
+			   /usr/share/java/findbugs.jar,\
 			   icons/,\
 			   plugin/,\
 			   plugin.properties,\
@@ -17,15 +17,15 @@
 			   plugin_fr.properties,\
 			   plugin_ja.properties,\
 			   welcome.xml,\
-			   findbugs-ant.jar,\
+			   /usr/share/java/ant-findbugs.jar,\
 			   META-INF/,\
-			   asm-3.1.jar,\
-			   asm-commons-3.1.jar,\
-			   asm-tree-3.1.jar,\
-			   dom4j-1.6.1.jar,\
-			   jaxen-1.1.1.jar,\
-			   commons-lang-2.4.jar,\
-			   jFormatString.jar,\
+			   /usr/share/java/objectweb-asm/asm.jar,\
+			   /usr/share/java/objectweb-asm/asm-commons.jar,\
+			   /usr/share/java/objectweb-asm/asm-tree.jar,\
+			   /usr/share/java/dom4j.jar,\
+			   /usr/share/java/jaxen.jar,\
+			   /usr/share/java/commons-lang.jar,\
+			   /usr/share/java/jFormatString.jar,\
 			   surelogic.png,\
 			   umdFindbugs.png
 src.includes = .classpath,\
@@ -37,11 +37,11 @@
 			   about.html,\
 			   about.ini,\
 			   about.properties,\
-			   annotations.jar,\
-			   bcel.jar,\
-			   jsr305.jar,\
+			   /usr/share/java/findbugs-annotations.jar,\
+			   /usr/share/java/findbugs-bcel.jar,\
+			   /usr/share/java/jsr-305.jar,\
 			   findbugs-plugin.jar,\
-			   findbugs.jar,\
+			   /usr/share/java/findbugs.jar,\
 			   icons/,\
 			   plugin/,\
 			   plugin.properties,\
@@ -64,13 +64,13 @@
 			   plugin_feature.xml,\
 			   plugin_site.xml,\
 			   umdFindbugs.png,\
-			   asm-3.1.jar,\
-			   asm-commons-3.1.jar,\
-			   asm-tree-3.1.jar,\
-			   dom4j-1.6.1.jar,\
-			   jaxen-1.1.1.jar,\
-			   commons-lang-2.4.jar,\
-			   jFormatString.jar,\
+			   /usr/share/java/objectweb-asm/asm.jar,\
+			   /usr/share/java/objectweb-asm/asm-commons.jar,\
+			   /usr/share/java/objectweb-asm/asm-tree.jar,\
+			   /usr/share/java/dom4j.jar,\
+			   /usr/share/java/jaxen.jar,\
+			   /usr/share/java/commons-lang.jar,\
+			   /usr/share/java/jFormatString.jar,\
 			   surelogic.png
 jars.compile.order = findbugs-plugin.jar
 source.findbugs-plugin.jar = src/,buildtools/
diff -dur eclipsePlugin-1.3.7.20081230.ORIG/build.xml eclipsePlugin-1.3.7.20081230/build.xml
--- eclipsePlugin-1.3.7.20081230.ORIG/build.xml	2008-11-10 10:27:54.000000000 -0700
+++ eclipsePlugin-1.3.7.20081230/build.xml	2009-01-02 22:08:30.000000000 -0700
@@ -10,7 +10,7 @@
 	been built from within Eclipse, and the binaries reside in the "bin.dir"
 -->
 
-<project name="fbeclipse" default="fbjars">
+<project name="fbeclipse" default="classes">
 
 	<property file="build.properties" />
 
@@ -39,19 +39,26 @@
 			<include name="**/*.jar"/>
 			<exclude name="edu.umd.cs.findbugs.**/*.jar"/>
 		</fileset>
-		<fileset file="findbugs.jar"/>
-		<fileset file="bcel.jar"/>
-		<fileset file="jsr305.jar"/>
-		<fileset file="jFormatString.jar"/>
-		<fileset file="commons-lang-2.4.jar"/>
-		<fileset file="asm-3.1.jar"/>
-		<fileset file="asm-tree-3.1.jar"/>
-		<fileset file="asm-commons-3.1.jar"/>
+		<fileset dir="${eclipseJdtPlugin.dir}">
+			<include name="**/*.jar"/>
+		</fileset>
+		<fileset dir="${eclipseSdkPlugin.dir}">
+			<include name="**/*.jar"/>
+		</fileset>
+		<fileset file="/usr/share/java/findbugs.jar"/>
+		<fileset file="/usr/share/java/findbugs-bcel.jar"/>
+		<fileset file="/usr/share/java/jsr-305.jar"/>
+		<fileset file="/usr/share/java/jFormatString.jar"/>
+		<fileset file="/usr/share/java/commons-lang.jar"/>
+		<fileset file="/usr/share/java/objectweb-asm/asm.jar"/>
+		<fileset file="/usr/share/java/objectweb-asm/asm-tree.jar"/>
+		<fileset file="/usr/share/java/objectweb-asm/asm-commons.jar"/>
+		<fileset file="@SWT_JAR@"/>
 	</path>
 
 	<path id="tools.classpath">
-		<pathelement location="dom4j-1.6.1.jar"/>
-		<pathelement location="jaxen-1.1.1.jar"/>
+		<pathelement location="/usr/share/java/dom4j.jar"/>
+		<pathelement location="/usr/share/java/jaxen.jar"/>
 		<pathelement location="${bin.dir}"/>
 	</path>
 
@@ -75,7 +82,7 @@
 		<mkdir dir="${bin.dir}"/>
 	</target>
 
-	<target name="classes" depends="init,fbjars" description="Compile java source files">
+	<target name="classes" depends="init" description="Compile java source files">
 		<mkdir dir="${bin.dir}"/>
 		<!-- Compile Java source files. -->
 		<javac srcdir="${src.dir}"
diff -dur eclipsePlugin-1.3.7.20081230.ORIG/META-INF/MANIFEST.MF eclipsePlugin-1.3.7.20081230/META-INF/MANIFEST.MF
--- eclipsePlugin-1.3.7.20081230.ORIG/META-INF/MANIFEST.MF	2008-12-10 16:26:00.000000000 -0700
+++ eclipsePlugin-1.3.7.20081230/META-INF/MANIFEST.MF	2009-01-02 22:08:30.000000000 -0700
@@ -4,17 +4,19 @@
 Bundle-SymbolicName: edu.umd.cs.findbugs.plugin.eclipse; singleton:=true
 Bundle-Version: 1.3.7.qualifier
 Bundle-ClassPath: findbugs-plugin.jar,
- jsr305.jar,
- bcel.jar,
- dom4j-1.6.1.jar,
- jaxen-1.1.1.jar,
+ jsr-305.jar,
+ jcip-annotations.jar,
+ ant.jar,
+ findbugs-bcel.jar,
+ dom4j.jar,
+ jaxen.jar,
  findbugs.jar,
  jFormatString.jar,
- asm-tree-3.1.jar,
- asm-3.1.jar,
- asm-commons-3.1.jar,
- commons-lang-2.4.jar,
- findbugs-ant.jar
+ asm-tree.jar,
+ asm.jar,
+ asm-commons.jar,
+ commons-lang.jar,
+ ant-findbugs.jar
 Bundle-Activator: de.tobject.findbugs.FindbugsPlugin
 Bundle-Vendor: FindBugs Project
 Bundle-Localization: plugin


--- NEW FILE import.log ---
eclipse-findbugs-1_3_7-3_fc10:HEAD:eclipse-findbugs-1.3.7-3.fc10.src.rpm:1236802294


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-findbugs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Mar 2009 20:10:17 -0000	1.1
+++ .cvsignore	11 Mar 2009 20:13:34 -0000	1.2
@@ -0,0 +1 @@
+eclipsePlugin-1.3.7.20081230-source.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-findbugs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Mar 2009 20:10:17 -0000	1.1
+++ sources	11 Mar 2009 20:13:34 -0000	1.2
@@ -0,0 +1 @@
+42e28f0fef9ebd6ae1e827ddec05a26a  eclipsePlugin-1.3.7.20081230-source.zip




More information about the fedora-extras-commits mailing list