From 3fcec9c424606fa1987ee1b49a3f08f587ca057d2c2f390d2f4a4a0d98a4031c Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 6 Feb 2019 09:10:55 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/javacc?expand=0&rev=16

---
 javacc.spec | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/javacc.spec b/javacc.spec
index e291c7f..a04bfd2 100644
--- a/javacc.spec
+++ b/javacc.spec
@@ -3,7 +3,6 @@
 #
 # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,11 +21,10 @@ Name:           javacc
 Version:        7.0.4
 Release:        0
 Summary:        A Parser and Scanner Generator for Java
-License:        BSD
+License:        BSD-3-Clause
 Group:          Development/Libraries/Java
 URL:            http://javacc.org
 Source0:        https://github.com/javacc/javacc/archive/%{version}.tar.gz
-
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  javacc
@@ -34,7 +32,6 @@ BuildRequires:  javapackages-local
 # Explicit javapackages-tools requires since scripts use
 # /usr/share/java-utils/java-functions
 Requires:       javapackages-tools
-
 BuildArch:      noarch
 
 %description
@@ -48,7 +45,7 @@ with JavaCC), actions, debugging, etc.
 
 %package manual
 Summary:        Manual for %{name}
-Group:          Development/Libraries/Java
+Group:          Documentation/Other
 
 %description manual
 Manual for %{name}.
@@ -63,13 +60,13 @@ Examples for %{name}.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Libraries/Java
+Group:          Documentation/HTML
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 find ./examples -type f -exec sed -i 's/\r//' {} \;
 
@@ -82,7 +79,7 @@ ant \
   jar javadoc
 
 # The pom dependencies are also wrong
-%mvn_artifact --skip-dependencies pom.xml target/javacc-%{version}.jar
+%{mvn_artifact} --skip-dependencies pom.xml target/javacc-%{version}.jar
 
 %install
 # jar