Fix XMvn configuration for native JNI repos

- Resolves: rhbz#1021608
This commit is contained in:
Mikolaj Izdebski 2013-10-21 18:52:55 +02:00
parent f0ee4e270e
commit 7ca24acbd2
2 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,35 @@
From 5cf973ec6ab8d5268cbce6c5b0ee068c644284e1 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 21 Oct 2013 18:49:58 +0200
Subject: [PATCH] Fix XMvn configuration for native JNI repos
See: https://bugzilla.redhat.com/show_bug.cgi?id=1021608
---
configs/configuration-20.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configs/configuration-20.xml b/configs/configuration-20.xml
index b4b978a..883d6b1 100644
--- a/configs/configuration-20.xml
+++ b/configs/configuration-20.xml
@@ -87,6 +87,7 @@
<stereotypes>
<stereotype>
<extension>jar</extension>
+ <type>native</type>
</stereotype>
</stereotypes>
</repository>
@@ -108,8 +109,8 @@
<configuration>
<repositories>
<repository>base-raw-pom</repository>
- <repository>base-jar</repository>
<repository>base-jni</repository>
+ <repository>base-jar</repository>
</repositories>
</configuration>
</repository>
--
1.8.1.4

View File

@ -1,6 +1,6 @@
Name: javapackages-tools
Version: 3.4.0
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Macros and scripts for Java packaging support
@ -8,6 +8,9 @@ License: BSD
URL: https://fedorahosted.org/javapackages/
Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
# For for rhbz#1021608, backported from upstream commit 5cf973e
Patch0001: 0001-Fix-XMvn-configuration-for-native-JNI-repos.patch
BuildArch: noarch
BuildRequires: jpackage-utils
@ -90,6 +93,7 @@ Requires: fedora-review
%setup -q -n javapackages-%{version}
%build
%patch0001 -p1
%configure
./build
pushd python
@ -128,6 +132,10 @@ popd
%changelog
* Mon Oct 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.0-3
- Fix XMvn configuration for native JNI repos
- Resolves: rhbz#1021608
* Mon Oct 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.0-2
- Require exact version of python-javapackages