From 5f4189fd6f62e810becafe074fcdd8f2cef3cb578696b85a457b0e7ffe041e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 25 Jul 2018 05:34:52 +0000 Subject: [PATCH] - Update to version 5.2.0+git20180620.70fa2258: OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=46 --- javapackages-tools.changes | 2 +- javapackages-tools.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/javapackages-tools.changes b/javapackages-tools.changes index fe0192a..7f8346d 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -6,7 +6,7 @@ Tue Jul 24 14:09:47 UTC 2018 - tchvatal@suse.com ------------------------------------------------------------------- Tue Jul 24 13:45:21 UTC 2018 - tchvatal@suse.com -- Update to version 5.0.0+git20180620.70fa2258: +- Update to version 5.2.0+git20180620.70fa2258: * Rename the async kwarg in call_script to wait (reverses the logic) * Actually bump version to 5.3.0 snapshot * Bump version in VERSION file diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 42c1137..f3272db 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -49,7 +49,6 @@ BuildRequires: xz Provides: jpackage-utils = %{version} Obsoletes: %{name}-doc Obsoletes: jpackage-utils < %{version} -BuildArch: noarch %if %{with python} BuildRequires: python3-lxml BuildRequires: python3-nose @@ -170,6 +169,9 @@ files=" for i in $files; do rm -rf %{buildroot}/$i done +%else +# we want this in the basic package always +cat files-filesystem >> files-tools %endif rm -rf %{buildroot}%{_datadir}/fedora-review/ @@ -183,8 +185,6 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/ %files -f files-tools %license LICENSE %dir %{_datadir}/maven-metadata -# The bellow one is split in fedora, we don't want to do that -%{_libexecdir}/rpm/macros.d/macros.javapackages-filesystem %else %files -n javapackages-local -f files-local %dir %{_datadir}/java-utils