[antlr] Fix licensing of ShowString.java, StreamConverter.java in examples, see BZ#848662

Sat Aug 18 13:33:11 UTC 2012

commit a51b6538988639bc70038aab7a226a889dd26254
Author: Milos Jakubicek <xjakub at fi.muni.cz>
Date:   Sat Aug 18 15:32:25 2012 +0200

    Fix licensing of ShowString.java, StreamConverter.java in examples,
    see BZ#848662

 antlr-examples-license.patch |   98 ++++++++++++++++++++++++++++++++++++++++++
 antlr.spec                   |    9 +++-
 2 files changed, 106 insertions(+), 1 deletions(-)
---

diff --git a/antlr-examples-license.patch b/antlr-examples-license.patch
new file mode 100644
index 0000000..14dda64
--- /dev/null
+++ b/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.*;
diff --git a/antlr.spec b/antlr.spec
index 2680a97..b7243ef 100644
--- a/antlr.spec
+++ b/antlr.spec
@@ -4,7 +4,7 @@
 Summary:		ANother Tool for Language Recognition
 Name:			antlr
 Version:		2.7.7
-Release:		22%{?dist}
+Release:		23%{?dist}
 Epoch:			0
 License:		Public Domain
 URL:			http://www.antlr.org/
@@ -13,6 +13,8 @@ Source0:		http://www.antlr2.org/download/antlr-%{version}.tar.gz
 Source1:		%{name}-build.xml
 Source2:		%{name}-script
 Patch1:			%{name}-%{version}-newgcc.patch
+# see BZ#848662
+Patch2:			antlr-examples-license.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %ifarch %ix86 x86_64 ia64 armv4l sparcv9 alpha s390x ppc ppc64
@@ -102,6 +104,7 @@ Python runtime support for ANTLR-generated parsers
 find . -name "*.jar" -exec rm -f {} \;
 cp -p %{SOURCE1} build.xml
 %patch1
+%patch2 -p1
 # CRLF->LF
 sed -i 's/\r//' LICENSE.txt
 
@@ -193,6 +196,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/antlr-*
 
 %changelog
+* Sat Aug 18 2012 Miloš Jakubíček <xjakub at fi.muni.cz> - 0:2.7.7-23
+- Add patch updating license on ShowString.java and StreamConverter.java
+  examples (thanks to Tom Callaway, see BZ#848662)
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.7.7-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
