Accepting request 973937 from home:urbic:branches:Java:packages

- Update to version 7.0.11
  * Modifications in version 7.0.11
    - #193 : Code error in class RCharacterList.SortDescriptors():
      fixed
  * Modifications in version 7.0.10
    - #183 : Lookahead is broken since 7.0.5 (introduced in commit
      fbac68f)
  * Modifications in version 7.0.9
    - pom.xml : change deployment on OSS to automatic release
    - documentation : fix broken links
  * Modifications in version 7.0.8
    - #175 : Doesn’t work in Turkish Locale
    - #73 : javacc/c++: invalid lookahead processing: missing one
      lookahead to get rid of the conflict
  * Modifications in version 7.0.7
    - JavaCC.jj : remove unused c++ declaration blocs tokens
    - #172 : add a specific ‘-version’ command line argument
  * Modifications in version 7.0.6
    The following changes are not upward compatible with the
    previous 7.0.5 version but have a very little impact on
    existing grammars. Main advantage is to prepare a more smooth
    upgrade with the upcoming javacc-8.0.0 major release.
    - C++ generation: renaming the option TOKEN_EXTENDS by
      TOKEN_SUPER_CLASS
    - C++ generation: renaming the option TOKEN_INCLUDES by
      TOKEN_INCLUDE
    - C++ generation: renaming the option PARSER_INCLUDES by
      PARSER_INCLUDE
    - C++ generation: renaming the option TOKEN_MANAGER_INCLUDES by
      TOKEN_MANAGER_INCLUDE
  * Modifications in version 7.0.5
    - #42: new README.md file.
    - #71: Add support for Java7 language features.
    - #75: Allow empty type parameters in Java code of grammar files.
    - #77: javacc.org is out of date.
    - #92: Avoid warning of unused import in generated
      ParserTokenManager.
    - #99: LookaheadSuccess creation performance improved.
    Removing IDE specific files. Declare trace_indent only if debug
    parser is enabled. CPPParser.jj grammar added to grammars.
    Build with Maven is working again.
    —WARNING—WARNING—WARNING— Required Java Platform: Standard
    Edition 7.0: known under Eclipse as JavaSE-1.7

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

7.0.4.tar.gz

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

javacc-7.0.11.tar.gz

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

javacc.changes

@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+Wed Apr 27 17:08:11 UTC 2022 - Anton Shvetz <shvetz.anton@gmail.com>
+
+- Update to version 7.0.11
+  * Modifications in version 7.0.11
+    - #193 : Code error in class RCharacterList.SortDescriptors():
+      fixed
+  * Modifications in version 7.0.10
+    - #183 : Lookahead is broken since 7.0.5 (introduced in commit
+      fbac68f)
+  * Modifications in version 7.0.9
+    - pom.xml : change deployment on OSS to automatic release
+    - documentation : fix broken links
+  * Modifications in version 7.0.8
+    - #175 : Doesn’t work in Turkish Locale
+    - #73 : javacc/c++: invalid lookahead processing: missing one
+      lookahead to get rid of the conflict
+  * Modifications in version 7.0.7
+    - JavaCC.jj : remove unused c++ declaration blocs tokens
+    - #172 : add a specific ‘-version’ command line argument
+  * Modifications in version 7.0.6
+    The following changes are not upward compatible with the
+    previous 7.0.5 version but have a very little impact on
+    existing grammars. Main advantage is to prepare a more smooth
+    upgrade with the upcoming javacc-8.0.0 major release.
+    - C++ generation: renaming the option TOKEN_EXTENDS by
+      TOKEN_SUPER_CLASS
+    - C++ generation: renaming the option TOKEN_INCLUDES by
+      TOKEN_INCLUDE
+    - C++ generation: renaming the option PARSER_INCLUDES by
+      PARSER_INCLUDE
+    - C++ generation: renaming the option TOKEN_MANAGER_INCLUDES by
+      TOKEN_MANAGER_INCLUDE
+  * Modifications in version 7.0.5
+    - #42: new README.md file.
+    - #71: Add support for Java7 language features.
+    - #75: Allow empty type parameters in Java code of grammar files.
+    - #77: javacc.org is out of date.
+    - #92: Avoid warning of unused import in generated
+      ParserTokenManager.
+    - #99: LookaheadSuccess creation performance improved.
+    Removing IDE specific files. Declare trace_indent only if debug
+    parser is enabled. CPPParser.jj grammar added to grammars.
+    Build with Maven is working again.
+    —WARNING—WARNING—WARNING— Required Java Platform: Standard
+    Edition 7.0: known under Eclipse as JavaSE-1.7
+
 -------------------------------------------------------------------
 Fri Mar 18 19:26:58 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

javacc.spec

@@ -24,13 +24,13 @@
 %bcond_with bootstrap
 %endif
 %global base_name javacc
-Version:        7.0.4
+Version:        7.0.11
 Release:        0
 Summary:        A Parser and Scanner Generator for Java
 License:        BSD-3-Clause
 Group:          Development/Libraries/Java
 URL:            https://javacc.org
-Source0:        https://github.com/javacc/javacc/archive/%{version}.tar.gz
+Source0:        https://github.com/javacc/javacc/archive/refs/tags/%{base_name}-%{version}.tar.gz
 BuildRequires:  ant
 BuildRequires:  java-devel >= 1.8
 BuildArch:      noarch
@@ -82,21 +82,21 @@ Group:          Documentation/HTML
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{base_name}-%{version}
+%autosetup -n %{base_name}-%{base_name}-%{version}
 rm -f lib/*.jar
 %if %{without bootstrap}
 rm -f bootstrap/javacc.jar
 build-jar-repository -s -p bootstrap javacc
 
 find ./examples -type f -exec sed -i 's/\r//' {} \;
+rm examples/JavaGrammars/cpp/.gitignore
 
 # The pom dependencies are wrong
 %pom_xpath_remove pom:project/pom:dependencies
 %endif
 
 %build
-%{ant} \
+%{ant} -Dant.build.javac.{source,target}=8 \
-  -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 \
 %if %{with bootstrap}
   jar
 %else
@@ -105,20 +105,20 @@ find ./examples -type f -exec sed -i 's/\r//' {} \;
 
 %install
 # jar
-install -dm 0755 %{buildroot}%{_javadir}
+install -dm0755 %{buildroot}%{_javadir}
-install -pm 0644 target/%{base_name}-%{version}.jar %{buildroot}%{_javadir}/%{base_name}.jar
+install -pm0644 target/%{base_name}-%{version}.jar %{buildroot}%{_javadir}/%{base_name}.jar
 
 %if %{without bootstrap}
 
 # pom
-install -dm 0755 %{buildroot}%{_mavenpomdir}
+install -dm0755 %{buildroot}%{_mavenpomdir}
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}.pom
+install -pm0644 pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}.pom
 %add_maven_depmap %{base_name}.pom %{base_name}.jar
 # javadoc
-install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+install -dm0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/javadoc/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}
-%fdupes -s www
+%fdupes -s docs
 %fdupes -s examples
 
 %jpackage_script javacc '' '' javacc javacc true
@@ -140,11 +140,11 @@ ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh
 %{_bindir}/jjtree
 %endif
 %license LICENSE
-%doc README
+%doc README.md
 
 %if %{without bootstrap}
 %files manual
-%doc www/*
+%doc docs/*
 
 %files demo
 %doc examples