diff --git a/0001-Allow-ZIP-files-in-usr-share-java.patch b/0001-Allow-ZIP-files-in-usr-share-java.patch new file mode 100644 index 0000000..3b47afe --- /dev/null +++ b/0001-Allow-ZIP-files-in-usr-share-java.patch @@ -0,0 +1,57 @@ +From 61c9ae9b76c821bc05ddfadfd8d897a2d050afe4 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Tue, 7 Jan 2014 18:39:35 +0100 +Subject: [PATCH] Allow ZIP files in /usr/share/java + +Maybe /usr/share/java is not the best place to store ZIP files, but +packages are doing so anyways and allowing ZIPs here simplifies +packaging. +--- + configs/configuration-20-rpmbuild-raw.xml | 1 + + configs/configuration-20-rpmbuild.xml | 1 + + configs/configuration-20.xml | 5 +++++ + 3 files changed, 7 insertions(+) + +diff --git a/configs/configuration-20-rpmbuild-raw.xml b/configs/configuration-20-rpmbuild-raw.xml +index 472b55b..8cfedb4 100644 +--- a/configs/configuration-20-rpmbuild-raw.xml ++++ b/configs/configuration-20-rpmbuild-raw.xml +@@ -30,6 +30,7 @@ + + + jar ++ zip + + + +diff --git a/configs/configuration-20-rpmbuild.xml b/configs/configuration-20-rpmbuild.xml +index c6b91bd..6f8e3b8 100644 +--- a/configs/configuration-20-rpmbuild.xml ++++ b/configs/configuration-20-rpmbuild.xml +@@ -42,6 +42,7 @@ + + + jar ++ zip + + + +diff --git a/configs/configuration-20.xml b/configs/configuration-20.xml +index 883d6b1..1dbff14 100644 +--- a/configs/configuration-20.xml ++++ b/configs/configuration-20.xml +@@ -75,6 +75,11 @@ + + + jar ++ ++ zip + + + +-- +1.8.4.2 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index e90d4dd..33f808e 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,6 +1,6 @@ Name: javapackages-tools Version: 3.4.2 -Release: 1%{?dist} +Release: 2%{?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 +# Backported from upstream commit 61c9ae9 +Patch0: 0001-Allow-ZIP-files-in-usr-share-java.patch + BuildArch: noarch BuildRequires: jpackage-utils @@ -90,6 +93,7 @@ Requires: fedora-review %prep %setup -q -n javapackages-%{version} +%patch0 -p1 %build %configure @@ -130,6 +134,9 @@ popd %changelog +* Tue Jan 7 2014 Mikolaj Izdebski - 3.4.2-2 +- Allow ZIP files in %{_javadir} + * Thu Dec 05 2013 Michal Srb - 3.4.2-1 - Update to upstream bugfix release 3.4.2