Attachment 854571 Details for Bug 1056681 – Patch

[patch] Patch

jsr-rhel7.patch (text/plain), 2.53 KB, created by Nathan Kinder on 2014-01-23 18:43:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2014-01-23 18:43:55 UTC

Size: 2.53 KB

patch

obsolete

>From e0c0119320d053d848e70251f40008564f9805be Mon Sep 17 00:00:00 2001
>From: Mikolaj Izdebski <mizdebsk@redhat.com>
>Date: Wed, 13 Nov 2013 17:27:07 +0100
>Subject: [PATCH] Update to current packaging guidelines
>
>- Resolves: rhbz#1029989
>---
> jsr-311.spec | 47 ++++++++++-------------------------------------
> 1 file changed, 10 insertions(+), 37 deletions(-)
>
>diff --git a/jsr-311.spec b/jsr-311.spec
>index 545f94e..aceee4e 100644
>--- a/jsr-311.spec
>+++ b/jsr-311.spec
>@@ -1,6 +1,6 @@
> Name: jsr-311
> Version: 1.1.1
>-Release: 4%{?dist}
>+Release: 5%{?dist}
> Summary: JAX-RS: Java API for RESTful Web Services
> Group: Development/Libraries
> License: CDDL
>@@ -13,21 +13,12 @@ Source0: %{name}-%{version}.tgz
> # Patch the POM:
> Patch0: %{name}-pom.patch
> 
>-BuildRequires: java-devel
>-BuildRequires: jpackage-utils
>-
> BuildRequires: buildnumber-maven-plugin
> BuildRequires: junit
> BuildRequires: maven-local
>-BuildRequires: maven-compiler-plugin
>-BuildRequires: maven-jar-plugin
>-BuildRequires: maven-javadoc-plugin
> BuildRequires: maven-plugin-bundle
> BuildRequires: maven-source-plugin
> 
>-Requires: jpackage-utils
>-Requires: java
>-
> BuildArch: noarch
> 
> 
>@@ -37,8 +28,6 @@ JAX-RS: Java API for RESTful Web Services
> 
> %package javadoc
> Summary: Javadocs for %{name}
>-Group: Documentation
>-Requires: jpackage-utils
> 
> 
> %description javadoc
>@@ -49,43 +38,27 @@ This package contains javadoc for %{name}.
> %setup -q
> %patch0
> 
>+%mvn_file : %{name}
>+
> 
> %build
>-mvn-rpmbuild \
>-  -Dproject.build.sourceEncoding=UTF-8 \
>-  install \
>-  javadoc:aggregate
>+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
> 
> 
> %install
>+%mvn_install
> 
>-# Jar files:
>-install -d -m 755 %{buildroot}%{_javadir}
>-install -pm 644 target/jsr311-api-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
>-
>-# POM files:
>-install -d -m 755 %{buildroot}%{_mavenpomdir}
>-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
> 
>-# Javadoc files:
>-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
>-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
>+%files -f .mfiles
> 
>-# Dependencies map:
>-%add_maven_depmap JPP-%{name}.pom %{name}.jar
> 
>-
>-%files
>-%{_javadir}/*.jar
>-%{_mavenpomdir}/*
>-%{_mavendepmapfragdir}/*
>-
>-
>-%files javadoc
>-%{_javadocdir}/%{name}
>+%files javadoc -f .mfiles-javadoc
> 
> 
> %changelog
>+* Wed Nov 13 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.1-5
>+- Update to current packaging guidelines
>+
> * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-4
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
> 
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 1056681: 854571