Attachment 854161 Details for Bug 1056750 – Patch

[patch] Patch

stax-ex.patch (text/plain), 1.90 KB, created by Nathan Kinder on 2014-01-23 02:19:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2014-01-23 02:19:10 UTC

Size: 1.90 KB

patch

obsolete

>From e3b00a222923642fa94fbfceed14d383a679f719 Mon Sep 17 00:00:00 2001
>From: Mikolaj Izdebski <mizdebsk@redhat.com>
>Date: Wed, 13 Nov 2013 17:59:01 +0100
>Subject: [PATCH] Update to current packaging guidelines
>
>- Resolves: rhbz#1030003
>---
> stax-ex.spec | 36 ++++++++++--------------------------
> 1 file changed, 10 insertions(+), 26 deletions(-)
>
>diff --git a/stax-ex.spec b/stax-ex.spec
>index 4dcd7c6..cc67d7c 100644
>--- a/stax-ex.spec
>+++ b/stax-ex.spec
>@@ -1,6 +1,6 @@
> Name: stax-ex
> Version: 1.7.1
>-Release: 4%{?dist}
>+Release: 5%{?dist}
> Summary: StAX API extensions
> Group: Development/Libraries
> License: CDDL or GPLv2
>@@ -56,45 +56,29 @@ mv LICENSE.txt LICENSE.txt.tmp
> iconv -f ISO-8859-1 -t UTF-8 LICENSE.txt.tmp > LICENSE.txt
> dos2unix LICENSE.txt
> 
>+%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 -m 644 target/stax-ex-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
>-
>-# POM files:
>-install -d -m 755 %{buildroot}%{_mavenpomdir}
>-cp -p pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
>-
>-# Javadoc files:
>-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
>-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
> 
>-# Dependencies map:
>-%add_maven_depmap JPP-%{name}.pom %{name}.jar
>-
>-
>-%files
>-%{_javadir}/*
>-%{_mavenpomdir}/*
>-%{_mavendepmapfragdir}/*
>+%files -f .mfiles
> %doc LICENSE.txt
> 
> 
>-%files javadoc
>-%{_javadocdir}/%{name}
>+%files javadoc -f .mfiles-javadoc
> %doc LICENSE.txt
> 
> 
> %changelog
>+* Wed Nov 13 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.1-5
>+- Update to current packaging guidelines
>+
> * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.1-4
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
> 
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 1056750: 854161