diff --git a/antlr-examples-license.patch b/antlr-examples-license.patch deleted file mode 100644 index 14dda64..0000000 --- a/antlr-examples-license.patch +++ /dev/null @@ -1,98 +0,0 @@ -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.*; diff --git a/antlr.spec b/antlr.spec index 2392558..8b3ae28 100644 --- a/antlr.spec +++ b/antlr.spec @@ -4,7 +4,7 @@ Summary: ANother Tool for Language Recognition Name: antlr Version: 2.7.7 -Release: 66%{?dist} +Release: 67%{?dist} License: ANTLR-PD URL: http://www.antlr2.org/ # ./generate-tarball.sh @@ -15,8 +15,6 @@ 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 @@ -73,7 +71,6 @@ This package provides a static C++ library for parsers generated by ANTLR2. find . -name "*.jar" -exec rm -f {} \; cp -p %{SOURCE1} build.xml %patch1 -%patch2 -p1 # CRLF->LF sed -i 's/\r//' LICENSE.txt @@ -130,6 +127,9 @@ install -p -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir} %license LICENSE.txt %changelog +* Wed Aug 11 2021 Marian Koncek - 2.7.7-67 +- Remove files with proprietary license headers + * Wed Jul 21 2021 Fedora Release Engineering - 2.7.7-66 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/generate-tarball.sh b/generate-tarball.sh index 74b872f..0404e77 100755 --- a/generate-tarball.sh +++ b/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,6 +20,10 @@ find -name '*.exe' -delete find -name '*.dll' -delete find -name '*.so' -delete -tar cf "../${name}-${version}.tar.gz" * +# 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" * cd .. rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/sources b/sources index 0c0fb2b..d6e6b74 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (antlr-2.7.7.tar.gz) = 7e05d440513663dab1960974ac61694552583bdd20d6eac2bff27f5142b118a26022d910b44312cdac9164b087c7cd4d1c8325e1ec914f9704b3cdd5f4b2b166 +SHA512 (antlr-2.7.7.tar.gz) = 48f62a91ae9c1c8e18c7aadbb4d9173c2fd83c1ba86c2317511977b83f00c9e13e320c520731a1ba66b57f06071bf0b52dfddf2969f4d6a519bffd17885e3ddc SHA512 (antlr-2.7.7.pom) = 4a34de18bee216852f43efddcd3bced1708548ebff7372b4ec4ecb6c289b36190b4d0d5588b86f9b65b3bc64756290b66bf1d6d9ed49d0cb8b972921829cba9e