Update to upstream bugfix release 3.4.1

This commit is contained in:
Stanislav Ochotnicky 2013-11-05 16:50:56 +01:00
parent c8df4d2914
commit 7865f437c4
4 changed files with 7 additions and 42 deletions

1
.gitignore vendored
View File

@ -56,3 +56,4 @@
/javapackages-3.3.0.tar.xz
/javapackages-3.3.1.tar.xz
/javapackages-3.4.0.tar.xz
/javapackages-3.4.1.tar.xz

View File

@ -1,35 +0,0 @@
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: 3%{?dist}
Version: 3.4.1
Release: 1%{?dist}
Summary: Macros and scripts for Java packaging support
@ -8,9 +8,6 @@ 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
@ -91,7 +88,6 @@ Requires: fedora-review
%prep
%setup -q -n javapackages-%{version}
%patch0001 -p1
%build
%configure
@ -132,6 +128,9 @@ popd
%changelog
* Tue Nov 05 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.4.1-1
- Update to upstream bugfix release 3.4.1
* Mon Oct 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.0-3
- Fix XMvn configuration for native JNI repos
- Resolves: rhbz#1021608

View File

@ -1 +1 @@
685c7aae7d070418d3a9d60d82c7b270 javapackages-3.4.0.tar.xz
6abef7f7bf08c84fc62f03f8d03f8959 javapackages-3.4.1.tar.xz