Attachment 575372 Details for Bug 810214 – patch fixing the problem

[patch] patch fixing the problem

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

(hide)

Description:

Filename:

MIME Type:

Creator: Mikolaj Izdebski

Created: 2012-04-05 11:21:54 UTC

Size: 4.28 KB

patch

obsolete

>From 4f120c005fb44e219728766c69f3e1d0f5a83bbf Mon Sep 17 00:00:00 2001
>From: Mikolaj Izdebski <mizdebsk@redhat.com>
>Date: Thu, 5 Apr 2012 13:13:49 +0200
>Subject: [PATCH] Update to maven 3
>
>- Set java dependency to >= 1:1.6.0
>- Cleanup according to Fedora Packaging Guidelines
>- Add a workaround for a bug in RPM
>---
> felix-shell.spec |   64 ++++++++++++++++++++---------------------------------
> 1 files changed, 24 insertions(+), 40 deletions(-)
>
>diff --git a/felix-shell.spec b/felix-shell.spec
>index 4646c9f..d60eaf4 100644
>--- a/felix-shell.spec
>+++ b/felix-shell.spec
>@@ -1,7 +1,7 @@
> %global bundle org.apache.felix.shell
> Name:           felix-shell
> Version:        1.4.2
>-Release:        5%{?dist}
>+Release:        6%{?dist}
> Summary:        Apache Felix Shell Service
> 
> Group:          Development/Libraries
>@@ -9,27 +9,23 @@ License:        ASL 2.0
> URL:            http://felix.apache.org
> Source0:        http://www.picvi.com/external/apache/felix/org.apache.felix.shell-1.4.2-project.tar.gz
> #Fixed org.osgi.core and org.osgi.compendium's groupId
>-Patch0:        felix-shell-pom.patch
>-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>+Patch0:         felix-shell-pom.patch
> 
> BuildArch: noarch
> 
> BuildRequires: java-devel >= 1:1.6.0
> BuildRequires: jpackage-utils
>-BuildRequires: maven2
>+BuildRequires: maven
> BuildRequires: felix-osgi-core
> BuildRequires: felix-osgi-compendium
> BuildRequires: maven-plugin-bundle
> BuildRequires: felix-parent
> 
>-Requires:       java
>+Requires:       java >= 1:1.6.0
> Requires:       jpackage-utils
> Requires: felix-osgi-core
> Requires: felix-osgi-compendium
> 
>-Requires(post):       jpackage-utils
>-Requires(postun):     jpackage-utils
>-
> 
> %description
> A simple OSGi command shell service.
>@@ -48,59 +44,47 @@ API documentation for %{name}.
> %patch0 -p0
> 
> %build
>-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
>-
>-mvn-jpp \
>-        -e \
>-        -Dmaven2.jpp.mode=true \
>-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
>-        -Dmaven.test.skip=true \
>-        install javadoc:javadoc
>+# -Dmaven.test.skip=true
>+mvn-rpmbuild -e install javadoc:javadoc
> 
> %install
>-rm -rf %{buildroot}
>-
>-# jars
>-install -Dpm 644 target/%{bundle}-%{version}.jar   %{buildroot}%{_javadir}/felix/%{name}-%{version}.jar
>-
>-(cd %{buildroot}%{_javadir}/felix && for jar in *-%{version}*; \
>-    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
> 
>-%add_to_maven_depmap org.apache.felix %{bundle} %{version} JPP/felix %{name}
>+# jar
>+install -d -m 755 %{buildroot}%{_javadir}/felix
>+install -Dpm 644 target/%{bundle}-%{version}.jar   %{buildroot}%{_javadir}/felix/%{name}.jar
> 
>-# poms
>+# pom
> install -d -m 755 %{buildroot}%{_mavenpomdir}
> install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.felix-%{name}.pom
>+%add_maven_depmap JPP.felix-%{name}.pom felix/%{name}.jar
> 
> # javadoc
>-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
>-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
>-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
>+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
>+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
> 
>+%pre javadoc
>+# RPM bug workaround, remove in F20
>+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
>+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
> 
>-%post
>-%update_maven_depmap
>-
>-%postun
>-%update_maven_depmap
>-
>-%clean
>-rm -rf %{buildroot}
> 
> %files
>-%defattr(-,root,root,-)
> %doc LICENSE NOTICE
> %{_javadir}/felix/*
> %{_mavenpomdir}/JPP.felix-%{name}.pom
> %{_mavendepmapfragdir}/*
> 
> %files javadoc
>-%defattr(-,root,root,-)
> %doc LICENSE NOTICE
>-%{_javadocdir}/%{name}-%{version}
> %{_javadocdir}/%{name}
> 
> %changelog
>+* Thu Apr  5 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4.2-6
>+- Update to maven 3
>+- Set java dependency to >= 1:1.6.0
>+- Cleanup according to Fedora Packaging Guidelines
>+- Add a workaround for a bug in RPM
>+
> * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-5
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>@@ -117,4 +101,4 @@ rm -rf %{buildroot}
> - Fix directory that owned by other package in files section
> 
> * Fri Jun 25 2010 Hui Wang <huwang@redhat.com> - 1.4.2-1
>-- Initial version of the package
>\ No newline at end of file
>+- Initial version of the package
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 810214: 575372