Improve GPL detection

pombredanne · pombredanne · commit 28e871f8c395 · 2024-10-13T09:44:25.000+02:00
Signed-off-by: Philippe Ombredanne &lt;pombredanne@nexb.com&gt;
diff --git a/src/licensedcode/data/rules/gpl-1.0-plus_421.RULE b/src/licensedcode/data/rules/gpl-1.0-plus_421.RULE
@@ -2,9 +2,10 @@
 license_expression: gpl-1.0-plus
 is_license_notice: yes
 relevance: 100
+skip_for_required_phrase_generation: yes
 ---
 
 is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-{{GNU General Public License}} for more details.
+{{GNU General Public License}} for more details.
diff --git a/src/licensedcode/data/rules/gpl-2.0-plus_107.RULE b/src/licensedcode/data/rules/gpl-2.0-plus_107.RULE
@@ -4,9 +4,9 @@ is_license_notice: yes
 ---
 
 is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public Licence as published by
+it under the terms of the {{GNU General Public Licence as published by
 the Free Software Foundation; either version 2 of the Licence, or
-(at your option) any later version.
+(at your option) any later version}}.
 You should have received a copy of the GNU General Public Licence
 along with ; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/src/licensedcode/data/rules/gpl-2.0-plus_14.RULE b/src/licensedcode/data/rules/gpl-2.0-plus_14.RULE
@@ -1,28 +1,28 @@
 ---
-license_expression: gpl-2.0-plus
+license_expression: gpl-2.0-plus AND gpl-3.0-plus 
 is_license_notice: yes
-notes: Pychess german notice text
+notes: Pychess german notice text. Note the combo of 2 and 3 versions. Maybe a translation typo?
 ---
 
 PyChess is free software; you can redistribute it and/or modify 
-it under the terms of the {{GNU General Public License as published by 
-the Free Software Foundation; either version 2 of the License, or 
-(at your option) any later version}}.
+it under the terms of the {{GNU General Public License}} as published by 
+the Free Software Foundation; {{either version 2}} of the License, or 
+{{(at your option) any later version}}.
 
 PyChess is distributed in the hope that it will be useful, 
 but WITHOUT ANY WARRANTY; without even the implied warranty of 
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-{{GNU General Public License}} for more details.
+GNU General Public License for more details.
 
-You should have received a copy of the {{GNU General Public License}} 
+You should have received a copy of the GNU General Public License 
 along with PyChess; if not, write to the Free Software Foundation, Inc., 
 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-PyChess ist freie Software. Sie können es unter den Bedingungen der {{GNU 
+PyChess ist freie Software. Sie können es unter den Bedingungen der GNU 
 General 
-Public License}}, wie von der Free Software Foundation veröffentlicht, 
+Public License, wie von der Free Software Foundation veröffentlicht, 
 weitergeben und/oder 
-modifizieren, entweder gemass Version 3 der Lizenz oder (nach Ihrer Option) 
+modifizieren, {{entweder gemass Version 3 der Lizenz}} oder {{(nach Ihrer Option)}} 
 jeder späteren 
 Version.
 
@@ -31,11 +31,11 @@ Nutzen
 sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie 
 der MARKTREIFE 
 oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in 
-der {{GNU General 
-Public License}}.
+der GNU General 
+Public License.
 
-Sie sollten ein Exemplar der {{GNU General Public License}} zusammen mit PyChess 
+Sie sollten ein Exemplar der GNU General Public License zusammen mit PyChess 
 
 erhalten haben. Falls nicht, schreiben Sie an die Free Software Foundation, 
 
-Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA.
+Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA.
diff --git a/src/licensedcode/data/rules/gpl-2.0-plus_31.RULE b/src/licensedcode/data/rules/gpl-2.0-plus_31.RULE
@@ -1,6 +1,6 @@
 ---
 license_expression: gpl-2.0-plus
-is_license_reference: yes
+is_license_notice: yes
 relevance: 80
 minimum_coverage: 100
 referenced_filenames:
diff --git a/src/licensedcode/data/rules/gpl-2.0-plus_4.RULE b/src/licensedcode/data/rules/gpl-2.0-plus_4.RULE
@@ -4,13 +4,13 @@ is_license_notice: yes
 ---
 
 is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public Licence
+ modify it under the terms of the {{GNU General Public Licence
  as published by the Free Software Foundation; either version 2
- of the Licence, or (at your option) any later version.
+ of the Licence, or (at your option) any later version.}}
   is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public Licence for more details.
  You should have received a copy of the GNU General Public Licence
  along with ; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
diff --git a/src/licensedcode/data/rules/gpl-2.0-plus_403.RULE b/src/licensedcode/data/rules/gpl-2.0-plus_403.RULE
@@ -7,5 +7,5 @@ relevance: 100
 *   This program is free software; you can redistribute it and/or modify it
   *   under the terms of the {{GNU General Public License}} as published by the
   *   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  *   02110-1301 USA; either version 2 of the License, or (at your option) any
-  *   later version;
+  *   02110-1301 USA; {{either version 2 of the License, or (at your option) any
+  *   later version;}}
diff --git a/src/licensedcode/data/rules/gpl-2.0-plus_41.RULE b/src/licensedcode/data/rules/gpl-2.0-plus_41.RULE
@@ -5,9 +5,9 @@ notes: Pychess template
 ---
 
 is free software; you can redistribute it and/or modify 
-it under the terms of the {{GNU General Public License as published by 
-the Free Software Foundation; either version 2 of the License, or 
-(at your option) any later version}}.
+it under the terms of the {{GNU General Public License}} as published by 
+the Free Software Foundation; {{either version 2 of the License,}} or 
+{{(at your option) any later version}}.
 
 PyChess is distributed in the hope that it will be useful, 
 but WITHOUT ANY WARRANTY; without even the implied warranty of 
@@ -16,4 +16,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
 You should have received a copy of the {{GNU General Public License}} 
 along with PyChess; if not, write to the Free Software Foundation, Inc.
-51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
diff --git a/src/licensedcode/data/rules/gpl-2.0-plus_required_phrase_41.RULE b/src/licensedcode/data/rules/gpl-2.0-plus_required_phrase_41.RULE
@@ -1,10 +1,10 @@
 ---
 license_expression: gpl-2.0-plus
 is_license_notice: yes
-is_required_phrase: yes
 relevance: 100
+skip_for_required_phrase_generation: yes
 ---
 
-GNU General Public License as published by\n"
+{{GNU General Public License as published by\n"
      "the Free Software Foundation; either version 2 of the License, or\n"
-     "(at your option) any later version
+     "(at your option) any later version}}
diff --git a/src/licensedcode/data/rules/gpl-2.0_or_gpl-3.0_11.RULE b/src/licensedcode/data/rules/gpl-2.0_or_gpl-3.0_11.RULE
@@ -5,4 +5,4 @@ is_license_notice: yes
 
 is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 or 3 of the License.
+the Free Software Foundation; {{either version 2 or 3 of the License}}.
diff --git a/src/licensedcode/data/rules/gpl-3.0-plus_pychess.RULE b/src/licensedcode/data/rules/gpl-3.0-plus_pychess.RULE
@@ -4,11 +4,11 @@ is_license_notice: yes
 notes: German Pychess
 ---
 
-PyChess   ist freie Software. Sie können es unter den Bedingungen der {{GNU 
+PyChess   ist freie Software. Sie können es unter den Bedingungen der GNU 
 General 
-Public License}}, wie von der Free Software Foundation veröffentlicht, 
+Public License, wie von der Free Software Foundation veröffentlicht, 
 weitergeben und/oder 
-modifizieren, entweder gemass Version 3 der Lizenz oder (nach Ihrer Option) 
+modifizieren, {{entweder gemass Version 3 der Lizenz oder (nach Ihrer Option)}}
 jeder späteren 
 Version.
 
@@ -17,9 +17,9 @@ Nutzen
 sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie 
 der MARKTREIFE 
 oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in 
-der {{GNU General 
-Public License}}.
+der GNU General 
+Public License.
 
 Sie sollten ein Exemplar der {{GNU General Public License}} zusammen mit  PyChess  
 
-erhalten haben. Falls nicht, schreiben Sie an die Free Software Foundation,
+erhalten haben. Falls nicht, schreiben Sie an die Free Software Foundation,
diff --git a/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_20.RULE b/src/licensedcode/data/rules/gpl-3.0-plus_with_gcc-exception-3.1_20.RULE
@@ -3,7 +3,7 @@ license_expression: gpl-3.0-plus WITH gcc-exception-3.1
 is_license_notice: yes
 ---
 
-GNU Modula-2 is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 3, or (at your option) any later
-version.
+{{GNU Modula-2}} is free software; you can redistribute it and/or modify it under
+the terms of the {{GNU General Public License}} as published by the Free
+Software Foundation; {{either version 3, or (at your option)}} any later
+version.
diff --git a/src/licensedcode/data/rules/gpl-3.0_560.RULE b/src/licensedcode/data/rules/gpl-3.0_560.RULE
@@ -7,4 +7,4 @@ referenced_filenames:
 
 you can redistribute it and/or modify it under the terms of
 * the {{GNU General Public License}} as published by the Free Software Foundation, either version
-* 3 of the License.See LICENSE for details
+* {{3 of the License.}}See LICENSE for details
diff --git a/src/licensedcode/data/rules/gpl_125.RULE b/src/licensedcode/data/rules/gpl_125.RULE
@@ -4,4 +4,4 @@ is_license_reference: yes
 relevance: 100
 ---
 
-Under the terms of the {{GNU General Public License}}.
+Under {{the terms of the GNU General Public License}}.
diff --git a/src/licensedcode/data/rules/gpl_63.RULE b/src/licensedcode/data/rules/gpl_63.RULE
@@ -1,10 +1,9 @@
 ---
 license_expression: gpl-1.0-plus
 is_license_reference: yes
-is_required_phrase: yes
 relevance: 100
-minimum_coverage: 100
 notes: No version gpl declaration
+skip_for_required_phrase_generation: yes
 ---
 
-GNU General Public License
+{{GNU General Public License}}
diff --git a/src/licensedcode/data/rules/lgpl-3.0_56.RULE b/src/licensedcode/data/rules/lgpl-3.0_56.RULE
@@ -5,5 +5,5 @@ relevance: 100
 ---
 
 is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation,  version 3 of the License.
+ it under the terms of the {{GNU Lesser General Public License as published by
+ the Free Software Foundation,  version 3 of the License.}}
diff --git a/tests/licensedcode/data/datadriven/lic1/gpl-2.0-plus_33.txt.yml b/tests/licensedcode/data/datadriven/lic1/gpl-2.0-plus_33.txt.yml
@@ -1,4 +1,8 @@
 license_expressions:
   - gpl-2.0-plus
+  - gpl-1.0-plus
   - gpl-2.0-plus
+  - gpl-1.0-plus
+  - gpl-1.0-plus
+  - gpl-1.0-plus
 notes: spurrious PHP license
