From b38e058ac5311cb0e0b88fa0f0d4431ec6130212 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Mon, 24 Feb 2014 09:15:25 +0100 Subject: [PATCH] Backport java-headless patches --- javapackages-tools.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index fcc3bbb..459e1e7 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,6 +1,6 @@ Name: javapackages-tools Version: 3.5.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Macros and scripts for Java packaging support @@ -11,6 +11,9 @@ Source0: https://fedorahosted.org/released/javapackages/javapackages-%{ve # Add support for installing Maven artifacts with .hpi extension Patch0: 0001-Add-support-for-installing-hpi.patch +Patch1: 0001-depgenerators-Switch-to-require-java-headless-instea.patch +Patch2: 0002-test-Fix-testsuite-for-java-headless-change.patch + BuildArch: noarch BuildRequires: jpackage-utils @@ -112,6 +115,8 @@ Requires: fedora-review %setup -q -n javapackages-%{version} %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %configure @@ -149,6 +154,9 @@ popd %changelog +* Mon Feb 24 2014 Stanislav Ochotnicky - 3.5.0-5 +- Backport java-headless patches + * Mon Feb 10 2014 Michal Srb - 3.5.0-4 - Add support for installing Maven artifacts with .hpi extension