Attachment 575373 Details for Bug 810215 – patch fixing the problem

[patch] patch fixing the problem

0001-Update-to-maven-3.patch (text/plain), 3.40 KB, created by Mikolaj Izdebski on 2012-04-05 11:24:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikolaj Izdebski

Created: 2012-04-05 11:24:33 UTC

Size: 3.40 KB

patch

obsolete

>From 5dece3a7784c97d8a428eca82f288e8ba5aca919 Mon Sep 17 00:00:00 2001
>From: Mikolaj Izdebski <mizdebsk@redhat.com>
>Date: Thu, 5 Apr 2012 11:37:48 +0200
>Subject: [PATCH] Update to maven 3
>
>- Remove rpm bug workaround
>- Don't mark maven fragment as conffile
>- Update upstream URLs
>- Cleanup according to Fedora Packaging Guidelines
>---
> felix-main.spec |   42 ++++++++++++++----------------------------
> 1 files changed, 14 insertions(+), 28 deletions(-)
>
>diff --git a/felix-main.spec b/felix-main.spec
>index 4df2ea0..fed9f65 100644
>--- a/felix-main.spec
>+++ b/felix-main.spec
>@@ -8,13 +8,13 @@
> 
> Name:    %{project}-main
> Version: 2.0.5
>-Release: 8%{?dist}
>+Release: 9%{?dist}
> Summary: Apache Felix Main
> 
> Group:   Development/Libraries
> License: ASL 2.0
>-URL:     http://felix.apache.org
>-Source0: http://www.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz
>+URL:     http://felix.apache.org/site/index.html
>+Source0: http://archive.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz
> 
> # TODO check availability and use original artifacts:
> # - org.apache.felix.shell https://bugzilla.redhat.com/show_bug.cgi?id=615869
>@@ -28,7 +28,7 @@ BuildRequires: felix-parent
> BuildRequires: felix-osgi-compendium
> BuildRequires: felix-osgi-core
> BuildRequires: felix-framework
>-BuildRequires: maven2
>+BuildRequires: maven
> BuildRequires:    maven-antrun-plugin
> BuildRequires:    maven-compiler-plugin
> BuildRequires:    maven-dependency-plugin
>@@ -50,9 +50,6 @@ Requires: felix-osgi-core
> Requires: felix-framework
> Requires: java >= 1:1.6.0
> 
>-Requires(post):   jpackage-utils
>-Requires(postun): jpackage-utils
>-
> %description
> Apache Felix Main Classes.
> 
>@@ -71,11 +68,7 @@ API documentation for %{name}.
> %patch0 -p1 -b .sav
> 
> %build
>-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
>-%__mkdir_p $MAVEN_REPO_LOCAL
>-mvn-jpp -e \
>-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
>-        install javadoc:javadoc
>+mvn-rpmbuild -e install javadoc:javadoc
> 
> %install
> # jars
>@@ -83,40 +76,33 @@ install -d -m 0755 %{buildroot}%{_javadir}/%{project}
> install -m 644 target/%{bundle}-%{version}.jar \
>         %{buildroot}%{_javadir}/%{project}/%{bundle}.jar
> 
>-%add_to_maven_depmap %{groupId} %{artifactId} %{version} JPP/%{project} %{bundle}
>-
> # poms
> install -d -m 755 %{buildroot}%{_mavenpomdir}
> install -pm 644 pom.xml %{buildroot}%{POM}
>+%add_maven_depmap JPP.%{project}-%{bundle}.pom %{project}/%{bundle}.jar
> 
> # javadoc
> install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
> %__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
> 
>-%post
>-%update_maven_depmap
>-
>-%postun
>-%update_maven_depmap
>-
>-%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,-)
> %{_javadir}/%{project}/*
> %{POM}
>-%config(noreplace) %{_mavendepmapfragdir}/%{name}
>+%{_mavendepmapfragdir}/%{name}
> %doc LICENSE
> 
> %files javadoc
>-%defattr(-,root,root,-)
> %{_javadocdir}/%{name}
> %doc LICENSE
> 
> %changelog
>+* Thu Apr  5 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.5-9
>+- Update to maven 3
>+- Remove rpm bug workaround
>+- Don't mark maven fragment as conffile
>+- Update upstream URLs
>+- Cleanup according to Fedora Packaging Guidelines
>+
> * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.5-8
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 810215: 575373