Attachment 586852 Details for Bug 825237 – Added POM

[patch] Added POM

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

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-05-25 12:22:56 UTC

Size: 3.99 KB

patch

obsolete

>From 751934526077a49e26a9bcaa8fda56521f51a80c Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Fri, 25 May 2012 12:24:15 +0200
>Subject: [PATCH] - Added POM - com.google.code.findbugs:* added to the
> dependencies map - Adapt to current guidelines
>
>---
> jFormatString-1.3.7.pom |   22 ++++++++++++++++++++++
> jFormatString.spec      |   33 ++++++++++++++++++++++++++-------
> 2 files changed, 48 insertions(+), 7 deletions(-)
> create mode 100644 jFormatString-1.3.7.pom
>
>diff --git a/jFormatString-1.3.7.pom b/jFormatString-1.3.7.pom
>new file mode 100644
>index 0000000..82751b0
>--- /dev/null
>+++ b/jFormatString-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>jFormatString</artifactId>
>+	<version>1.3.7</version>
>+	<packaging>jar</packaging>
>+	<url>http://findbugs.sourceforge.net/</url>
>+	<name>FindBugs-jFormatString</name>
>+	<description>jFormatString supports the FindBugs tool</description>
>+	<licenses>
>+		<license>
>+			<name>GNU Lesser Public License</name>
>+			<url>http://www.gnu.org/licenses/lgpl.html</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/jFormatString.spec b/jFormatString.spec
>index 81ea3a0..cfad472 100644
>--- a/jFormatString.spec
>+++ b/jFormatString.spec
>@@ -14,6 +14,8 @@ URL:            https://jformatstring.dev.java.net/
> #   (The password is "guest".)
> #   tar -cjvf jFormatString-0.tar.bz2 jformatstring
> Source0:        %{name}-%{version}.tar.bz2
>+#Source1:        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
>@@ -40,6 +42,8 @@ This package contains the API documentation for %{name}.
> %prep
> %setup -q -n jformatstring
> %patch0 -p1
>+cp -p %{SOURCE2} pom.xml
>+sed -i "s|1.3.7|1.3.9|" pom.xml
> 
> %build
> # Build the JAR
>@@ -61,21 +65,36 @@ mkdir -p $RPM_BUILD_ROOT%{_javadir}
> cp -p %{name}/build/%{name}.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: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 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>+cp -rp docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> 
> %files
>-%defattr(-,root,root,-)
> %doc www/index.html jFormatString/LICENSE
>-%{_javadir}/%{name}*
>+%{_javadir}/%{name}.jar
>+
>+%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
>+* Fri May 25 2012 gil cattaneo <puntogil@libero.it> 0-0.7.20081016svn
>+- 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> - 0-0.6.20081016svn
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 825237: 586852 | 625303