Attachment 624229 Details for Bug 825233 – Added POM -rebase

[patch] Added POM -rebase

0001-Added-POM.patch (text/plain), 3.79 KB, created by gil cattaneo on 2012-10-09 18:41:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-10-09 18:41:10 UTC

Size: 3.79 KB

patch

obsolete

>From 2877b4e086a46f78a5d6765ffd28586896500bfe Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Tue, 9 Oct 2012 20:39:51 +0200
>Subject: [PATCH] Added POM
>
>---
> .gitignore         |    1 +
> findbugs-bcel.spec |   41 ++++++++++++++++++++++++++++++-----------
> sources            |    1 +
> 3 files changed, 32 insertions(+), 11 deletions(-)
>
>diff --git a/.gitignore b/.gitignore
>index 6804583..d2a7fe5 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,2 @@
> bcel-5.2-src.tar.gz
>+/bcel-1.3.7.pom
>diff --git a/findbugs-bcel.spec b/findbugs-bcel.spec
>index e49b198..a41eb18 100644
>--- a/findbugs-bcel.spec
>+++ b/findbugs-bcel.spec
>@@ -9,7 +9,7 @@
> 
> Name:           findbugs-bcel
> Version:        5.2
>-Release:        %{findbugsver}%{?dist}.7
>+Release:        %{findbugsver}%{?dist}.8
> 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,42 @@ 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
>+# WARNING when use google pom change -a "com.google.code.findbugs:bcel" with -a "net.sourceforge.findbugs:bcel"
>+%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}/%{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
>-%defattr(-,root,root,-)
> %doc LICENSE.txt NOTICE.txt README.txt
>-%{_javadir}/findbugs-bcel*
>+%{_javadir}/%{name}.jar
>+%{_mavenpomdir}/JPP-%{name}.pom
>+%{_mavendepmapfragdir}/%{name}
> 
> %files javadoc
>-%defattr(-,root,root,-)
> %doc LICENSE.txt NOTICE.txt
>-%{_javadocdir}/findbugs-bcel*
>+%{_javadocdir}/%{name}
> 
> %changelog
>+* Tue Oct 09 2012 gil cattaneo <puntogil@libero.it> - 5.2-1.3.8.8
>+- Added POM
>+- com.google.code.findbugs:* added to the dependencies map
>+- Adapt to current guidelines
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2-1.3.8.7
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index 2d4bc00..75ecc79 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1,2 @@
>+3253d3beae7805db6be4c5f8615c6d64  bcel-1.3.7.pom
> 905b7e718e30e7ca726530ecf106e532  bcel-5.2-src.tar.gz
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 825233: 586851 | 624229