#11 update licensing
Merged 9 months ago by nim. Opened 9 months ago by nim.
nim/go-rpm-macros spdx  into  master

update licensing
Nicolas Mailhot • 9 months ago  

@@ -0,0 +1,9 @@ 

+ MIT License

+ 

+ Copyright © 2019 Nicolas Mailhot <nim@fedoraproject.org>

+ 

+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

+ 

+ The above copyright notice and this permission notice (including the next paragraph) shall be included in all copies or substantial portions of the Software.

+ 

+ THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

LICENSE.txt LICENSE
file renamed
file was moved with no change to the file
file modified
+1 -1

@@ -18,4 +18,4 @@ 

  

  ## Licensing

  

- *go-rpm-macros* is licensed under the GPL version 3 or later; read the *LICENSE* file.

+ *go-rpm-macros* is licensed under the GPL version 3 or later. The `spec` templates are licensed under the MIT license.

file modified
+4 -2

@@ -1,6 +1,6 @@ 

  #!/usr/bin/bash -e

- # Copyright © 2018 Nicolas Mailhot <nim@fedoraproject.org>,

- #                    Jan Chaloupka   <jchaloup@redhat.com>

+ # Copyright © 2018-2019 Nicolas Mailhot <nim@fedoraproject.org>,

+ #                       Jan Chaloupka   <jchaloup@redhat.com>

  #

  # 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

@@ -14,6 +14,8 @@ 

  #

  # You should have received a copy of the GNU General Public License

  # along with this program.  If not, see <https://www.gnu.org/licenses/>.

+ #

+ # SPDX-License-Identifier: GPL-3.0-or-later

  

  usage() {

  cat >&2 << EOF_USAGE

file modified
+2

@@ -1,3 +1,5 @@ 

+ # SPDX-License-Identifier: GPL-3.0-or-later

+ 

  %__go_path              ^%{gopath}/src/.+/.goipath$

  %__go_flags             path

  %__go_provides          go-rpm-integration provides --prefix "%{buildroot}" --go-path "%{gopath}" %{?goprovflags}

@@ -1,3 +1,5 @@ 

+ # SPDX-License-Identifier: GPL-3.0-or-later

+ 

  %__gobundled_path       ^%{gopath}/src/.+/vendor/.+/.*$

  %__gobundled_magic      ^(.*, )?directory$

  %__gobundled_flags      magic_and_path

@@ -1,3 +1,5 @@ 

+ # SPDX-License-Identifier: GPL-3.0-or-later

+ 

  %__gosymlink_path       ^%{gopath}/src/.*$

  %__gosymlink_magic      ^(.*, )?(broken )?symbolic link to .*$

  %__gosymlink_flags      magic_and_path

file modified
+2

@@ -13,6 +13,8 @@ 

  #

  # You should have received a copy of the GNU General Public License

  # along with this program.  If not, see <https://www.gnu.org/licenses/>.

+ #

+ # SPDX-License-Identifier: GPL-3.0-or-later

  

  while read dir ; do

    if [[ -d "${dir}" ]] ; then

file modified
+2

@@ -13,6 +13,8 @@ 

  #

  # You should have received a copy of the GNU General Public License

  # along with this program.  If not, see <https://www.gnu.org/licenses/>.

+ #

+ # SPDX-License-Identifier: GPL-3.0-or-later

  

  usage() {

  cat >&2 << EOF_USAGE

file modified
+2

@@ -13,6 +13,8 @@ 

  -- You should have received a copy of the GNU General Public License

  -- along with this program.  If not, see <https://www.gnu.org/licenses/>.

  --

+ -- SPDX-License-Identifier: GPL-3.0-or-later

+ 

  -- This file contains Lua code used in rpm macros to create rpm packages past

  -- the srpm stage: anything starting with %prep.

  --

file modified
+2

@@ -13,6 +13,8 @@ 

  -- You should have received a copy of the GNU General Public License

  -- along with this program.  If not, see <https://www.gnu.org/licenses/>.

  --

+ -- SPDX-License-Identifier: GPL-3.0-or-later

+ 

  -- This file contains Lua code used in rpm macros needed to create and process

  -- source rpm (srpm) Go (golang) packages.

  --

@@ -17,6 +17,8 @@ 

  #

  # This file contains macros for building projects in golang for packages

  # with golang compiler or gcc-go compiler based on an architecture.

+ #

+ # SPDX-License-Identifier: GPL-3.0-or-later

  

  # Minimal version of gcc providing gcc-go

  %gccgo_min_vers  5.0.0

@@ -17,6 +17,8 @@ 

  #

  # This file contains macros for building projects in golang for packages

  # with golang compiler or gcc-go compiler based on an architecture.

+ #

+ # SPDX-License-Identifier: GPL-3.0-or-later

  

  # Define commands for building

  # BUILD_ID can be generated for golang build no matter of debuginfo

file modified
+3 -1

@@ -1,4 +1,4 @@ 

- # Copyright © 2015-2018 Jan Chaloupka <jchaloup@redhat.com>,

+ # Copyright © 2015-2019 Jan Chaloupka <jchaloup@redhat.com>,

  #                       Nicolas Mailhot <nim@fedoraproject.org>

  #

  # This program is free software: you can redistribute it and/or modify

@@ -19,6 +19,8 @@ 

  #

  # The macros necessary at %setup and srpm stage are in the sister file

  # macros.go-srpm

+ #

+ # SPDX-License-Identifier: GPL-3.0-or-later

  

  # Default filtering policy

  # Complete or replace the following variables in your spec file if this policy

@@ -4,6 +4,8 @@ 

  #

  # Legacy deprecated bits graveyard, for compatibility only

  # Do not use, they *will* be removed

+ #

+ # SPDX-License-Identifier: GPL-3.0-or-later

  

  %gobuildroot %{expand:

  %{warn:%%gobuildroot is obsolete, use %%goprep in %%prep instead!}

@@ -1,4 +1,4 @@ 

- # Copyright © 2018 Nicolas Mailhot <nim@fedoraproject.org>

+ # Copyright © 2018-2019 Nicolas Mailhot <nim@fedoraproject.org>

  #

  # 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

@@ -17,6 +17,8 @@ 

  #

  # Internal utility macros

  # Direct use in spec file is not supported

+ #

+ # SPDX-License-Identifier: GPL-3.0-or-later

  

  %__godevelinstall(-i:v) %{expand:

  (

file modified
+3 -1

@@ -1,4 +1,4 @@ 

- # Copyright © 2015-2018 Jakub Cajka <jcajka@redhat.com>,

+ # Copyright © 2015-2019 Jakub Cajka <jcajka@redhat.com>,

  #                       Jan Chaloupka <jchaloup@redhat.com>,

  #                       Nicolas Mailhot <nim@fedoraproject.org>

  #

@@ -21,6 +21,8 @@ 

  #

  # This file provides only macros and must not use any other package except

  # redhat-rpm-macros.

+ #

+ # SPDX-License-Identifier: GPL-3.0-or-later

  

  # Define arches for PA and SA

  %golang_arches   @@GOLANG_ARCHES@@

@@ -1,4 +1,4 @@ 

- # Copyright © 2018 Nicolas Mailhot <nim@fedoraproject.org>

+ # Copyright © 2018-2019 Nicolas Mailhot <nim@fedoraproject.org>

  #

  # 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

@@ -12,6 +12,8 @@ 

  #

  # You should have received a copy of the GNU General Public License

  # along with this program.  If not, see <https://www.gnu.org/licenses/>.

+ #

+ # SPDX-License-Identifier: GPL-3.0-or-later

  

  # SRPM macros for Go packages.

  #

@@ -1,5 +1,7 @@ 

  # Minimal Go source code packaging template.

  #

+ # SPDX-License-Identifier: MIT

+ #

  # This template documents the minimal set of spec declarations, necessary to

  # publish Go source code to other packages. The sister “go-1-source-full”

  # template documents less common declarations; read it if your needs exceed

@@ -1,5 +1,7 @@ 

  # Complete Go source code packaging template.

  #

+ # SPDX-License-Identifier: MIT

+ #

  # This template complements “go-0-source-minimal”, with less usual spec

  # declarations.

  #

@@ -1,5 +1,7 @@ 

  # Minimal Go alternative import path packaging template.

  #

+ # SPDX-License-Identifier: MIT

+ #

  # Sometimes Go projects keep importing deprecated import path names, or use

  # forks with different names. Ideally, all codebases should be fixed to use the

  # current canonical import path, but that is not always possible.

@@ -1,5 +1,7 @@ 

  # Complete Go alternative import path packaging template.

  #

+ # SPDX-License-Identifier: MIT

+ #

  # This template complements “go-2-alternative import-path-minimal”, with less

  # usual spec declarations.

  #

@@ -1,5 +1,7 @@ 

  # Minimal Go binary packaging template.

  #

+ # SPDX-License-Identifier: MIT

+ #

  # This template documents the minimal set of spec declarations, necessary to

  # package Go projects that produce binaries. The sister “go-5-binary-full”

  # template documents less common declarations; read it if your needs exceed

@@ -1,5 +1,7 @@ 

  # Complete Go binary packaging template.

  #

+ # SPDX-License-Identifier: MIT

+ #

  # This template complements “go-5-binary-minimal”, with less usual spec

  # declarations.

  #

@@ -1,6 +1,8 @@ 

  # This template documents advanced Go packaging with multiples of everything.

  # Don’t try it before you understand how simpler Go packaging is done.

  #

+ # SPDX-License-Identifier: MIT

+ #

  # All the “go-*-” spec templates complement one another without documentation

  # overlaps. Try to read them all.

  #

@@ -2,6 +2,8 @@ 

  # mode provides the most packager control. However, the result is also more

  # difficult to get right and to maintain.

  #

+ # SPDX-License-Identifier: MIT

+ #

  # Using this packaging mode is not recommended unless you really need it. If

  # you prepare your sources correctly in prep you should not need it.

  #

@@ -119,7 +121,7 @@ 

  #

  # Old name aliasing

  install -m 0755 -vd %{buildroot}%{gopath}/src/%(dirname %{oldgoipath})

- ln -s %{gopath}/src/%{goipath} %{buildroot}%{gopath}/src/%{oldgoipath}

+ ln -rs %{buildroot}%{gopath}/src/%{goipath} %{buildroot}%{gopath}/src/%{oldgoipath}

  #

  install -m 0755 -vd                     %{buildroot}%{_bindir}

  install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/

no initial comment

Pull-Request has been merged by nim

9 months ago