Attachment 586851 Details for Bug 825233 – Added POM

[patch] Added POM

0001-Added-POM.patch (text/plain), 4.54 KB, created by gil cattaneo on 2012-05-25 12:14:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-05-25 12:14:13 UTC

Size: 4.54 KB

patch

obsolete

>From 833642c9114e89eeb6ff5652ab491cf9de328ba5 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Fri, 25 May 2012 12:13:12 +0200
>Subject: [PATCH] - Added POM - com.google.code.findbugs:* added to the
> dependencies map - Adapt to current guidelines
>
>---
> bcel-1.3.7.pom     |   22 ++++++++++++++++++++++
> findbugs-bcel.spec |   40 +++++++++++++++++++++++++++++-----------
> 2 files changed, 51 insertions(+), 11 deletions(-)
> create mode 100644 bcel-1.3.7.pom
>
>diff --git a/bcel-1.3.7.pom b/bcel-1.3.7.pom
>new file mode 100644
>index 0000000..6e0c210
>--- /dev/null
>+++ b/bcel-1.3.7.pom
>@@ -0,0 +1,22 @@
>+<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>bcel</artifactId>
>+	<version>1.3.7</version>
>+	<packaging>jar</packaging>
>+	<url>http://findbugs.sourceforge.net/</url>
>+	<name>FindBugs-bcel</name>
>+	<description>Modified BCEL for Findbugs</description>
>+	<licenses>
>+		<license>
>+			<name>The Apache Software License, Version 2.0</name>
>+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</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>
>diff --git a/findbugs-bcel.spec b/findbugs-bcel.spec
>index eefa5c0..dff4403 100644
>--- a/findbugs-bcel.spec
>+++ b/findbugs-bcel.spec
>@@ -9,7 +9,7 @@
> 
> Name:           findbugs-bcel
> Version:        5.2
>-Release:        %{findbugsver}%{?dist}.6
>+Release:        %{findbugsver}%{?dist}.7
> Summary:        Byte Code Engineering Library with findbugs extensions
> 
> Group:          Development/Libraries
>@@ -18,7 +18,8 @@ URL:            http://jakarta.apache.org/bcel/
> Source0:        http://www.apache.org/dist/jakarta/bcel/source/bcel-%{version}-src.tar.gz
> # This patch is available in the findbugs release, in src/patches/bcel.diff.
> Source1:        bcel.diff
>-
>+#Source2:        http://findbugs.googlecode.com/svn/repos/release-repository/com/google/code/findbugs/bcel/1.3.9/bcel-1.3.9.pom
>+Source2:        http://repo1.maven.org/maven2/net/sourceforge/findbugs/bcel/1.3.7/bcel-1.3.7.pom
> BuildRequires:  java-devel, jpackage-utils
> Requires:       java, jpackage-utils
> 
>@@ -44,6 +45,9 @@ Requires:       jpackage-utils
> %setup -q -n bcel-%{version}
> %{__patch} -p7 -s < %{SOURCE1}
> 
>+cp -p %{SOURCE2} pom.xml
>+sed -i "s|1.3.7|1.3.9|" pom.xml
>+
> %build
> # The ant and maven builds both try to download unneeded jars
> mkdir classes
>@@ -58,27 +62,41 @@ find src/java -type f -name '*.java' | xargs javadoc -sourcepath src/java \
>   -classpath classes -source 1.5 -encoding ISO8859-1 -d javadoc 
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
> 
> mkdir -p $RPM_BUILD_ROOT%{_javadir}
>-cp -p classes/findbugs-bcel-%{findbugsver}.jar $RPM_BUILD_ROOT%{_javadir}
>-ln -s findbugs-bcel-%{findbugsver}.jar $RPM_BUILD_ROOT%{_javadir}/findbugs-bcel.jar
>+cp -p classes/%{name}-%{findbugsver}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>+
>+# Install poms
>+mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
>+cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
>+
>+# Add depmaps
>+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "com.google.code.findbugs:bcel"
> 
> mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
>-cp -a javadoc $RPM_BUILD_ROOT%{_javadocdir}/findbugs-bcel-%{findbugsver}
>-ln -s findbugs-bcel-%{findbugsver} $RPM_BUILD_ROOT%{_javadocdir}/findbugs-bcel
>+cp -a javadoc $RPM_BUILD_ROOT%{_javadocdir}/findbugs-bcel
> 
> %files
>-%defattr(-,root,root,-)
> %doc LICENSE.txt NOTICE.txt README.txt
>-%{_javadir}/findbugs-bcel*
>+%{_javadir}/%{name}.jar
>+%{_mavenpomdir}/JPP-%{name}.pom
>+%{_mavendepmapfragdir}/%{name}
>+
>+%pre javadoc
>+# workaround for rpm bug, can be removed in F-17
>+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
>+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
> 
> %files javadoc
>-%defattr(-,root,root,-)
> %doc LICENSE.txt NOTICE.txt
>-%{_javadocdir}/findbugs-bcel*
>+%{_javadocdir}/%{name}
> 
> %changelog
>+* Fri May 25 2012 gil cattaneo <puntogil@libero.it> 5.2-1.3.8.7
>+- Added POM
>+- com.google.code.findbugs:* added to the dependencies map
>+- Adapt to current guidelines
>+
> * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2-1.3.8.6
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 825233: 586851 | 624229