search

rpminspect / rpminspect-data-fedora

Fedora-specific data and configuration files used by rpminspect
GNU General Public License v3.0
3 stars 33 forks source link

duplicate Apache Software License, Version 2.0 #25

Closed xsuchy closed 2 years ago

xsuchy commented 2 years ago

The file licenses/fedora.json contains:

  "Apache Software License 2.0": {
    "approved": "yes",
    "fedora_abbrev": "ASL 2.0",
    "fedora_name": "Apache Software License 2.0",
    "id": "35",
    "license_text": "",
    "spdx_abbrev": "Apache-2.0",
    "spdx_name": "Apache License 2.0",
    "url": "http://www.apache.org/licenses/LICENSE-2.0"
  },
  "Apache Software License, Version 2.0": {                                                                                                                                                       
    "approved": "yes",
    "fedora_abbrev": "ASL 2.0",
    "fedora_name": "Apache Software License 2.0",
    "id": "36",
    "license_text": "",
    "spdx_abbrev": "Apache-2.0",
    "spdx_name": "Apache License 2.0",
    "url": "http://www.apache.org/licenses/LICENSE-2.0"
  },
...
  "The Apache License, Version 2.0": {
    "approved": "yes",
    "fedora_abbrev": "ASL 2.0",
    "fedora_name": "Apache Software License 2.0",
    "id": "578",
    "license_text": "",
    "spdx_abbrev": "Apache-2.0",
    "spdx_name": "Apache License 2.0",
    "url": "http://www.apache.org/licenses/LICENSE-2.0"
  },
  "The Apache Software License, Version 2.0": {                                                                                                                                                   
    "approved": "yes",
    "fedora_abbrev": "ASL 2.0",
    "fedora_name": "Apache Software License 2.0",
    "id": "576",
    "license_text": "",
    "spdx_abbrev": "Apache-2.0",
    "spdx_name": "Apache License 2.0",
    "url": "http://www.apache.org/licenses/LICENSE-2.0"
  },

This seems duplicate to me (but the key string and id). I am not sure which one to delete and which to keep.

dcantrell commented 2 years ago

You can drop all but the first one and send a PR. The duplicates were likely a result of scanning code a long time ago and it came across those variations on the long license name. The string before the {} blocks are not used by rpminspect anyway.

This change also applies to rpminspect-data-centos and rpminspect-data-redhat, so if you want to send me PRs for those too, that would be helpful.

xsuchy commented 2 years ago

PR sent. I will leave centos and RH for you. :)