Attachment 625303 Details for Bug 825237 – Added POM -rebase

[patch] Added POM -rebase

0001-Added-POM.patch (text/plain), 4.51 KB, created by gil cattaneo on 2012-10-11 01:58:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-10-11 01:58:46 UTC

Size: 4.51 KB

patch

obsolete

>From 877db71750e76d8fc6b006482eebabc89f8a70bf Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Thu, 11 Oct 2012 03:56:33 +0200
>Subject: [PATCH] Added POM
>
>---
> .gitignore         |    1 +
> jFormatString.spec |   56 ++++++++++++++++++++++++++++++++++++++-------------
> sources            |    1 +
> 3 files changed, 43 insertions(+), 15 deletions(-)
>
>diff --git a/.gitignore b/.gitignore
>index b68e35c..661573a 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,2 @@
> jFormatString-0.tar.bz2
>+/jFormatString-1.3.7.pom
>diff --git a/jFormatString.spec b/jFormatString.spec
>index 9e62074..7abd644 100644
>--- a/jFormatString.spec
>+++ b/jFormatString.spec
>@@ -1,6 +1,6 @@
> Name:           jFormatString
> Version:        0
>-Release:        0.7.20081016svn%{?dist}
>+Release:        0.8.20081016svn%{?dist}
> Summary:        Java format string compile-time checker
> 
> Group:          Development/Libraries/Java
>@@ -14,13 +14,20 @@ URL:            https://jformatstring.dev.java.net/
> #   (The password is "guest".)
> #   tar -cjvf jFormatString-0.tar.bz2 jformatstring
> Source0:        %{name}-%{version}.tar.bz2
>+# http://findbugs.googlecode.com/svn/repos/release-repository/com/google/code/findbugs/jFormatString/1.3.9/jFormatString-1.3.9.pom
>+Source1:        http://repo1.maven.org/maven2/net/sourceforge/findbugs/jFormatString/1.3.7/jFormatString-1.3.7.pom
> # This patch has not been sent upstream, since it is Fedora specific.  This
> # gives the build system the path to the appropriate junit jar.
> Patch0:         %{name}-build.patch
> 
>-BuildRequires:  ant, java-devel, java-javadoc, jpackage-utils, junit4
>-Requires:       java, jpackage-utils
>+BuildRequires:  ant
>+BuildRequires:  java-devel
>+BuildRequires:  java-javadoc
>+BuildRequires:  jpackage-utils
>+BuildRequires:  junit4
> 
>+Requires:       java
>+Requires:       jpackage-utils
> BuildArch:      noarch
> 
> %description
>@@ -30,8 +37,9 @@ format string will be erroneous when executed at runtime.
> 
> %package javadoc
> Summary:        Javadoc documentation for %{name}
>-Group:          Development/Documentation
>-Requires:       %{name} = %{version}-%{release}, java-javadoc
>+Group:          Documentation
>+Requires:       %{name} = %{version}-%{release}
>+Requires:       java-javadoc
> Requires:       jpackage-utils
> 
> %description javadoc
>@@ -40,6 +48,8 @@ This package contains the API documentation for %{name}.
> %prep
> %setup -q -n jformatstring
> %patch0 -p1
>+cp -p %{SOURCE1} pom.xml
>+sed -i "s|1.3.7|1.3.9|" pom.xml
> 
> %build
> # Build the JAR
>@@ -54,28 +64,44 @@ javadoc -d docs -source 1.5 -sourcepath jFormatString/src/java \
>   -link file://%{_javadocdir}/java edu.umd.cs.findbugs.formatStringChecker
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
> 
> # JAR files
>-mkdir -p $RPM_BUILD_ROOT%{_javadir}
>+mkdir -p %{buildroot}%{_javadir}
> cp -p %{name}/build/%{name}.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>+  %{buildroot}%{_javadir}/%{name}.jar
>+
>+# Install poms
>+mkdir -p %{buildroot}%{_mavenpomdir}
>+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
>+
>+# Add depmaps
>+# WARNING when use google pom change -a "com.google.code.findbugs:jFormatString" with -a "net.sourceforge.findbugs:jFormatString"
>+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "com.google.code.findbugs:jFormatString"
> 
> # Javadocs
>-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
>-cp -rp docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
>-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>+mkdir -p %{buildroot}%{_javadocdir}/%{name}
>+cp -rp docs/* %{buildroot}%{_javadocdir}/%{name}
> 
> %files
>-%defattr(-,root,root,-)
> %doc www/index.html jFormatString/LICENSE
>-%{_javadir}/%{name}*
>+%{_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,-)
>-%{_javadocdir}/%{name}*
>+%{_javadocdir}/%{name}
>+%doc jFormatString/LICENSE
> 
> %changelog
>+* Wed Oct 10 2012 gil cattaneo <puntogil@libero.it> - 0-0.8.20081016svn
>+- Added maven pom
>+- Adapt to current guidelines
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0-0.7.20081016svn
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index fe20748..caa8340 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1,2 @@
>+b684d42e9301e314671ce52ab9d27c1e  jFormatString-1.3.7.pom
> 0bd082f8d7000eeb5634fa7d63b34ee0  jFormatString-0.tar.bz2
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 825237: 586852 | 625303