From 0ccc239ed409c9b240e9fa7871f47e801add9cd734079f822cbba5a6c4f8f928 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 9 Apr 2019 15:05:24 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javacc?expand=0&rev=23 --- javacc.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/javacc.spec b/javacc.spec index e13e812..f84ac84 100644 --- a/javacc.spec +++ b/javacc.spec @@ -32,18 +32,19 @@ Group: Development/Libraries/Java URL: http://javacc.org Source0: https://github.com/javacc/javacc/archive/%{version}.tar.gz BuildRequires: ant +BuildArch: noarch +%if %{with bootstrap} +Name: %{base_name}-bootstrap +BuildRequires: javapackages-tools +Provides: %{base_name} +%else +Name: %{base_name} +BuildRequires: %{base_name} BuildRequires: fdupes BuildRequires: javapackages-local # Explicit javapackages-tools requires since scripts use # /usr/share/java-utils/java-functions Requires: javapackages-tools -BuildArch: noarch -%if %{with bootstrap} -Name: %{base_name}-bootstrap -Provides: %{base_name} -%else -Name: %{base_name} -BuildRequires: %{base_name} Provides: %{base_name}-bootstrap Obsoletes: %{base_name}-bootstrap %endif @@ -85,12 +86,12 @@ rm -f lib/*.jar %if %{without bootstrap} rm -f bootstrap/javacc.jar build-jar-repository -s -p bootstrap javacc -%endif find ./examples -type f -exec sed -i 's/\r//' {} \; # The pom dependencies are wrong %pom_xpath_remove pom:project/pom:dependencies +%endif %build %{ant} \