Accepting request 672058 from home:fstrba:maven

upgrade

OBS-URL: https://build.opensuse.org/request/show/672058
OBS-URL: https://build.opensuse.org/package/show/Java:packages/javacc?expand=0&rev=14

7.0.4.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a6a2381dfae5fdfe7849b921c9950af594ff475b69fbc6e8568365c5734cf77c
+size 2842349

javacc

@@ -1,25 +0,0 @@
-#!/bin/sh
-# 
-# JavaCC script
-# JPackage Project <http://www.jpackage.org/>
-
-# Source functions library
-if [ -f /usr/share/java-utils/java-functions ] ; then 
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't find function library, aborting"
-  exit 1
-fi
-
-# Configuration
-MAIN_CLASS=javacc
-BASE_JARS="javacc.jar"
-
-# Set parameters
-set_jvm
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"

javacc-5.0src.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:766cae9d3710054f452a7f0779db885eacfdae363152cb2e7fe025aa7ea17370
-size 810123

javacc.patch

@@ -1,33 +0,0 @@
-diff -Naur javacc.old/src/org/javacc/jjdoc/build.xml javacc.changed/src/org/javacc/jjdoc/build.xml
---- javacc.old/src/org/javacc/jjdoc/build.xml	2004-12-24 19:11:13.000000000 +0100
-+++ javacc.changed/src/org/javacc/jjdoc/build.xml	2008-01-28 14:25:00.000000000 +0100
-@@ -38,7 +38,6 @@
-     <javac srcdir="${javacc.root}/src"
-            destdir="${javacc.root}/classes"
-            debug="${build.compiler.debug}"
--           source="1.4"
-            classpath="${javacc.root}/classes">
-     </javac>
-   </target>
-diff -Naur javacc.old/src/org/javacc/jjtree/build.xml javacc.changed/src/org/javacc/jjtree/build.xml
---- javacc.old/src/org/javacc/jjtree/build.xml	2005-08-13 18:57:35.000000000 +0200
-+++ javacc.changed/src/org/javacc/jjtree/build.xml	2008-01-28 14:24:43.000000000 +0100
-@@ -47,7 +47,6 @@
-     <javac srcdir="${javacc.root}/src"
-            destdir="${javacc.root}/classes"
-            debug="${build.compiler.debug}"
--           source="1.4"
-            classpath="${javacc.root}/classes">
-     </javac>
-   </target>
-diff -Naur javacc.old/src/org/javacc/parser/build.xml javacc.changed/src/org/javacc/parser/build.xml
---- javacc.old/src/org/javacc/parser/build.xml	2005-01-09 15:15:34.000000000 +0100
-+++ javacc.changed/src/org/javacc/parser/build.xml	2008-01-28 14:24:12.000000000 +0100
-@@ -45,7 +45,6 @@
-     <javac srcdir="${javacc.root}/src"
-            destdir="${javacc.root}/classes"
-            debug="${build.compiler.debug}"
--           source="1.4"
-            classpath="${javacc.root}/classes:${junit.jar}">
-     </javac>
-   </target>

javacc.spec

@@ -2,6 +2,8 @@
 # spec file for package javacc
 #
 # Copyright (c) 2018 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
@@ -12,98 +14,108 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           javacc
-Version:        5.0
+Version:        7.0.4
 Release:        0
-Summary:        A Parser and Scanner Generator for Java
+Summary:        A parser/scanner generator for java
-License:        BSD-3-Clause
+License:        BSD
 Group:          Development/Libraries/Java
-Url:            http://javacc.java.net/
+URL:            http://javacc.org
-Source0:        http://java.net/projects/%{name}/downloads/download/%{name}-%{version}src.tar.gz
+Source0:        https://github.com/javacc/javacc/archive/%{version}.tar.gz
-Source1:        javacc
+
-Source2:        jjdoc
-Source3:        jjtree
-Patch0:         javacc.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  java-devel
+BuildRequires:  javacc
-BuildRequires:  xml-commons-apis
+BuildRequires:  javapackages-local
+# Explicit javapackages-tools requires since scripts use
+# /usr/share/java-utils/java-functions
 Requires:       javapackages-tools
+
 BuildArch:      noarch
 
 %description
-Java Compiler Compiler (JavaCC) is the most popular parser generator
+Java Compiler Compiler (JavaCC) is the most popular parser generator for use
-for use with Java applications. A parser generator is a tool that reads
+with Java applications. A parser generator is a tool that reads a grammar
-a grammar specification and converts it to a Java program that can
+specification and converts it to a Java program that can recognize matches to
-recognize matches to the grammar. In addition to the parser generator
+the grammar. In addition to the parser generator itself, JavaCC provides other
-itself, JavaCC provides other standard capabilities related to parser
+standard capabilities related to parser generation such as tree building (via
-generation such as tree building (via a tool called JJTree included
+a tool called JJTree included with JavaCC), actions, debugging, etc.
-with JavaCC), actions, debugging, etc.
 
 %package manual
-Summary:        A Parser and Scanner Generator for Java
+Summary:        Manual for %{name}
 Group:          Development/Libraries/Java
 
 %description manual
-Java Compiler Compiler (JavaCC) is the most popular parser generator
+Manual for %{name}.
-for use with Java applications. A parser generator is a tool that reads
-a grammar specification and converts it to a Java program that can
-recognize matches to the grammar. In addition to the parser generator
-itself, JavaCC provides other standard capabilities related to parser
-generation such as tree building (via a tool called JJTree included
-with JavaCC), actions, debugging, etc.
 
 %package demo
-Summary:        A Parser and Scanner Generator for Java
+Summary:        Examples for %{name}
 Group:          Development/Libraries/Java
+Requires:       %{name} = %{version}-%{release}
 
 %description demo
-Java Compiler Compiler (JavaCC) is the most popular parser generator
+Examples for %{name}.
-for use with Java applications. A parser generator is a tool that reads
+
-a grammar specification and converts it to a Java program that can
+%package javadoc
-recognize matches to the grammar. In addition to the parser generator
+Summary:        Javadoc for %{name}
-itself, JavaCC provides other standard capabilities related to parser
+Group:          Development/Libraries/Java
-generation such as tree building (via a tool called JJTree included
+
-with JavaCC), actions, debugging, etc.
+%description javadoc
+This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n javacc
+%setup -q -n %{name}-%{version}
-%patch0 -p1
+
-cp %{SOURCE1} javacc
+# Remove binary information in the source tar
-cp %{SOURCE2} jjdoc
+find . -name "*.jar" -delete
-cp %{SOURCE3} jjtree
+find . -name "*.class" -delete
-mv www/doc .
+
+find ./examples -type f -exec sed -i 's/\r//' {} \;
 
 %build
+build-jar-repository -p bootstrap javacc
+
+# There is maven pom which doesn't really work for building. The tests don't
+# work either (even when using bundled jars).
 ant \
   -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
-  -Dversion=%{version} \
+  jar javadoc
-  jar
+
+# The pom dependencies are also wrong
+%mvn_artifact --skip-dependencies pom.xml target/javacc-%{version}.jar
 
 %install
-install -d -m 755 %{buildroot}%{_javadir}
+%mvn_file : %{name}
-install -m 644 bin/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-install -d -m 755 %{buildroot}%{_prefix}/bin
-install -m 755 javacc jjdoc jjtree %{buildroot}%{_prefix}/bin
-install -d -m 755 %{buildroot}%{_datadir}/%{name}
-cp -pr examples %{buildroot}%{_datadir}/%{name}
-%fdupes -s %{buildroot}%{_datadir}/%{name}
 
-%files
+%mvn_install -J target/javadoc
-%{_javadir}/*.jar
+%fdupes -s %{buildroot}%{_javadocdir}
-%doc LICENSE README
+%fdupes -s www
-%defattr(0755,root,root,0755)
+%fdupes -s examples
-%{_bindir}/*
+
+%jpackage_script javacc '' '' javacc javacc true
+ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh
+%jpackage_script jjdoc '' '' javacc jjdoc true
+%jpackage_script jjtree '' '' javacc jjtree true
+
+%files -f .mfiles
+%license LICENSE
+%doc README
+%{_bindir}/javacc
+%{_bindir}/javacc.sh
+%{_bindir}/jjdoc
+%{_bindir}/jjtree
 
 %files manual
-%doc doc/*
+%doc www/*
 
 %files demo
-%{_datadir}/%{name}/
+%doc examples
+
+%files javadoc -f .mfiles-javadoc
+%license LICENSE
 
 %changelog

jjdoc

@@ -1,25 +0,0 @@
-#!/bin/sh
-# 
-# JJDoc script
-# JPackage Project <http://www.jpackage.org/>
-
-# Source functions library
-if [ -f /usr/share/java-utils/java-functions ] ; then 
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't find function library, aborting"
-  exit 1
-fi
-
-# Configuration
-MAIN_CLASS=jjdoc
-BASE_JARS="javacc.jar"
-
-# Set parameters
-set_jvm
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"

jjtree

@@ -1,25 +0,0 @@
-#!/bin/sh
-# 
-# JJTree script
-# JPackage Project <http://www.jpackage.org/>
-
-# Source functions library
-if [ -f /usr/share/java-utils/java-functions ] ; then 
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't find function library, aborting"
-  exit 1
-fi
-
-# Configuration
-MAIN_CLASS=jjtree
-BASE_JARS="javacc.jar"
-
-# Set parameters
-set_jvm
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"