4 changed files with 115 additions and 47 deletions
--- a/.antlr.metadata
+++ b/.antlr.metadata
@ -1 +1 @@
-827fa0f818141cfb8c648af7b6d033f708a717be SOURCES/antlr-2.7.7.tar.gz
+3bec329f1c7c9a3d2af1e2389f2e0ed479798a06 SOURCES/antlr-2.7.7.tar.gz
--- a/SOURCES/antlr-examples-license.patch
+++ b/SOURCES/antlr-examples-license.patch
@ -0,0 +1,98 @@
+diff -up antlr-2.7.7/examples/java/unicode.IDENTs/ShowString.java.licensefix antlr-2.7.7/examples/java/unicode.IDENTs/ShowString.java
+--- antlr-2.7.7/examples/java/unicode.IDENTs/ShowString.java.licensefix	2012-08-16 10:16:12.157567962 -0400
+++ antlr-2.7.7/examples/java/unicode.IDENTs/ShowString.java	2012-08-16 10:17:46.425574161 -0400
+@@ -1,19 +1,33 @@
+ 
+ /*
+- * Copyright (c) 1995-1998 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+  *
+- * Permission to use, copy, modify, and distribute this software
+- * and its documentation for NON-COMMERCIAL purposes and without
+- * fee is hereby granted provided that this copyright notice
+- * appears in all copies. Please refer to the file "copyright.html"
+- * for further important copyright and licensing information.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+  *
+- * SUN MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF
+- * THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+- * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+- * PARTICULAR PURPOSE, OR NON-INFRINGEMENT. SUN SHALL NOT BE LIABLE FOR
+- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - 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.
+ *
+ *   - Neither the name of Oracle or 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.
+  */
+ 
+ import java.awt.*;
+diff -up antlr-2.7.7/examples/java/unicode.IDENTs/StreamConverter.java.licensefix antlr-2.7.7/examples/java/unicode.IDENTs/StreamConverter.java
+--- antlr-2.7.7/examples/java/unicode.IDENTs/StreamConverter.java.licensefix	2012-08-16 10:18:24.649576674 -0400
+++ antlr-2.7.7/examples/java/unicode.IDENTs/StreamConverter.java	2012-08-16 10:18:49.002578275 -0400
+@@ -1,19 +1,33 @@
+ 
+ /*
+- * Copyright (c) 1995-1998 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+  *
+- * Permission to use, copy, modify, and distribute this software
+- * and its documentation for NON-COMMERCIAL purposes and without
+- * fee is hereby granted provided that this copyright notice
+- * appears in all copies. Please refer to the file "copyright.html"
+- * for further important copyright and licensing information.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+  *
+- * SUN MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF
+- * THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+- * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+- * PARTICULAR PURPOSE, OR NON-INFRINGEMENT. SUN SHALL NOT BE LIABLE FOR
+- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - 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.
+ *
+ *   - Neither the name of Oracle or 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.
+  */
+ 
+ import java.io.*;
--- a/SOURCES/generate-tarball.sh
+++ b/SOURCES/generate-tarball.sh
@ -10,7 +10,7 @@ wget "http://www.antlr2.org/download/antlr-${version}.tar.gz" -O "${name}-${vers
 rm -rf tarball-tmp
 mkdir tarball-tmp
 cd tarball-tmp
-tar -xf "../${name}-${version}.orig.tar.gz"
+tar xf "../${name}-${version}.orig.tar.gz"

 # CLEAN TARBALL
 # contain questionable things, such as csflex.exe
@ -20,10 +20,6 @@ find -name '*.exe' -delete
 find -name '*.dll' -delete
 find -name '*.so' -delete

-# rhbz#1986062
-rm "antlr-${version}/examples/java/unicode.IDENTs/StreamConverter.java"
-rm "antlr-${version}/examples/java/unicode.IDENTs/ShowString.java"
-
-tar -czf "../${name}-${version}.tar.gz" *
+tar cf "../${name}-${version}.tar.gz" *
 cd ..
 rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
--- a/SPECS/antlr.spec
+++ b/SPECS/antlr.spec
@ -1,10 +1,11 @@
+
 %global debug_package %{nil}
 # since we have only a static library

 Summary:       ANother Tool for Language Recognition
 Name:          antlr
 Version:       2.7.7
-Release:       68%{?dist}
+Release:       58%{?dist}
 License:       ANTLR-PD
 URL:           http://www.antlr2.org/
 # ./generate-tarball.sh
@ -15,11 +16,13 @@ Source3:       http://repo2.maven.org/maven2/antlr/antlr/%{version}/%{name}-%{ve
 # Repack the tarball without prebuilt binaries of unknown origin
 Source4:       generate-tarball.sh
 Patch1:        %{name}-%{version}-newgcc.patch
+# see BZ#848662
+Patch2:        antlr-examples-license.patch

 BuildRequires: gcc-c++
 BuildRequires: make
 BuildRequires: ant
-BuildRequires: java-devel
+BuildRequires: java-devel >= 1:1.7.0
 BuildRequires: javapackages-local

 %description
@ -65,12 +68,15 @@ Provides:      antlr-static = %{version}-%{release}
 %description C++
 This package provides a static C++ library for parsers generated by ANTLR2.

+
+
 %prep
 %setup -q
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 cp -p %{SOURCE1} build.xml
 %patch1
+%patch2 -p1
 # CRLF->LF
 sed -i 's/\r//' LICENSE.txt

@ -91,6 +97,8 @@ rm antlr.jar
 rm doc/{Makefile,Makefile.in}
 chmod 0644 doc/*

+
+
 %install
 # jars, POM and depmap
 %mvn_artifact %{SOURCE3} work/lib/%{name}.jar
@ -106,6 +114,8 @@ install -p -m 644 lib/cpp/antlr/*.hpp $RPM_BUILD_ROOT%{_includedir}/%{name}
 install -p -m 644 lib/cpp/src/libantlr.a $RPM_BUILD_ROOT%{_libdir}
 install -p -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir}

+
+
 %files tool -f .mfiles
 %license LICENSE.txt
 %{_bindir}/antlr
@ -119,6 +129,7 @@ install -p -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir}
 %{_libdir}/libantlr.a
 %{_bindir}/antlr-config

+
 %files manual
 %license LICENSE.txt
 %doc doc/*
@ -126,51 +137,14 @@ install -p -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir}
 %files javadoc -f .mfiles-javadoc
 %license LICENSE.txt

+
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.7.7-68
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Thu Jul 29 2021 Marian Koncek <mkoncek@redhat.com> - 2.7.7-67
- Remove files with proprietary license headers
-
-* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.7.7-66
- Remove Python runtime
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0:2.7.7-65
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.7.7-64
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.7.7-63
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 21 2020 Fabio Valentini <decathorpe@gmail.com> - 0:2.7.7-62
- Set javac source / target version to 1.8 to fix issues with Java 11.
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:2.7.7-61
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.7.7-60
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.7.7-58
 - Mass rebuild for javapackages-tools 201902

-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.7.7-59
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.7.7-57
 - Mass rebuild for javapackages-tools 201901

-* Wed Mar 27 2019 Miro Hrončok <mhroncok@redhat.com> - 0:2.7.7-58
- Subpackage python2-antlr was removed
-  https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.7.7-57
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Mon Jul 30 2018 Severin Gehwolf <sgehwolf@redhat.com> - 0:2.7.7-56
 - Add explicit requirement of javapackages-tools.