.gitignore

@@ -1 +1 @@
-SOURCES/release_7_0_2.tar.gz
+SOURCES/7.0.4.tar.gz

.javacc.metadata

@@ -1 +1 @@
-64e67a0efbaf8f83b599ffcecd88513b2e4e1bfd SOURCES/release_7_0_2.tar.gz
+2c9baf88da76fb56f4c7558ebe1a82154c99aaa0 SOURCES/7.0.4.tar.gz

SPECS/javacc.spec

@@ -1,43 +1,10 @@
-# Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-%global releasename release_%(tr . _ <<< %{version})
-
 Name:           javacc
-Version:        7.0.2
+Version:        7.0.4
-Release:        6%{?dist}
+Release:        5%{?dist}
-Epoch:          0
 Summary:        A parser/scanner generator for java
 License:        BSD
 URL:            http://javacc.org
-Source0:        https://github.com/javacc/javacc/archive/%{releasename}.tar.gz
+Source0:        https://github.com/javacc/javacc/archive/%{version}.tar.gz
 
 BuildRequires:  javapackages-local
 BuildRequires:  ant
@@ -56,12 +23,6 @@ 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 manual
-Summary:        Manual for %{name}
-
-%description manual
-Manual for %{name}.
-
 %package demo
 Summary:        Examples for %{name}
 Requires:       %{name} = %{version}-%{release}
@@ -76,7 +37,7 @@ Summary:        Javadoc for %{name}
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{releasename}
+%setup -q -n %{name}-%{version}
 
 # Remove binary information in the source tar
 find . -name "*.jar" -delete
@@ -84,11 +45,9 @@ find . -name "*.class" -delete
 
 find ./examples -type f -exec sed -i 's/\r//' {} \;
 
+%build
 build-jar-repository -p bootstrap javacc
 
-%mvn_file : %{name}
-
-%build
 # There is maven pom which doesn't really work for building. The tests don't
 # work either (even when using bundled jars).
 ant jar javadoc
@@ -97,6 +56,8 @@ ant jar javadoc
 %mvn_artifact --skip-dependencies pom.xml target/javacc-%{version}.jar
 
 %install
+%mvn_file : %{name}
+
 %mvn_install -J target/javadoc
 
 %jpackage_script javacc '' '' javacc javacc true
@@ -112,9 +73,6 @@ ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh
 %{_bindir}/jjdoc
 %{_bindir}/jjtree
 
-%files manual
-%doc www/*
-
 %files demo
 %doc examples
 
@@ -122,6 +80,25 @@ ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh
 %license LICENSE
 
 %changelog
+* Wed Nov 06 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.4-5
+- Downgrade to 7.0.4
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.5-2
+- Mass rebuild for javapackages-tools 201902
+
+* Wed Oct 23 2019 Marian Koncek <mkoncek@redhat.com> - 7.0.5-1
+- Update to upstream version 7.0.5
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.4-3
+- Mass rebuild for javapackages-tools 201901
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:7.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Oct 26 2018 Marian Koncek <mkoncek@redhat.com> - 0:7.0.4-1
+- Update to upstream version 7.0.4
+- Resolves: rhbz#1593262
+
 * Tue Jul 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 0:7.0.2-6
 - Add requirement on javapackages-tools for scripts using
   java-functions.
@@ -247,7 +224,7 @@ ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh
 * Fri Mar 31 2006 Sebastiano Vigna <vigna at acm.org> - 0:4.0-1jpp
 - Updated to 4.0
 
-* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:3.2-2jpp
+* Mon Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:3.2-2jpp
 - Rebuild with ant-1.6.2
 
 * Fri Jan 30 2004 Sebastiano Vigna <vigna at acm.org> 0:3.2-1jpp