diff --git a/.gitignore b/.gitignore index fd627a9..6c014e9 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/0001-Fix-XMvn-configuration-for-native-JNI-repos.patch b/0001-Fix-XMvn-configuration-for-native-JNI-repos.patch deleted file mode 100644 index e2d1cbc..0000000 --- a/0001-Fix-XMvn-configuration-for-native-JNI-repos.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5cf973ec6ab8d5268cbce6c5b0ee068c644284e1 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -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 @@ - - - jar -+ native - - - -@@ -108,8 +109,8 @@ - - - base-raw-pom -- base-jar - base-jni -+ base-jar - - - --- -1.8.1.4 - diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 0b34beb..b1f8039 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -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 - 3.4.1-1 +- Update to upstream bugfix release 3.4.1 + * Mon Oct 21 2013 Mikolaj Izdebski - 3.4.0-3 - Fix XMvn configuration for native JNI repos - Resolves: rhbz#1021608 diff --git a/sources b/sources index 452ab4b..94815dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -685c7aae7d070418d3a9d60d82c7b270 javapackages-3.4.0.tar.xz +6abef7f7bf08c84fc62f03f8d03f8959 javapackages-3.4.1.tar.xz