diff --git a/.gitignore b/.gitignore index b799fc7..1a9a6d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /milochristiansen-lua-1.1.3.tar.gz +/milochristiansen-lua-1.1.4.tar.gz diff --git a/golang-github-milochristiansen-lua.spec b/golang-github-milochristiansen-lua.spec index a0f83eb..552eb3e 100644 --- a/golang-github-milochristiansen-lua.spec +++ b/golang-github-milochristiansen-lua.spec @@ -1,16 +1,27 @@ -%if 0%{?fedora} || 0%{?rhel} == 6 +# If any of the following macros should be set otherwise, +# you can wrap any of them with the following conditions: +# - %%if 0%%{centos} == 7 +# - %%if 0%%{?rhel} == 7 +# - %%if 0%%{?fedora} == 23 +# Or just test for particular distribution: +# - %%if 0%%{centos} +# - %%if 0%%{?rhel} +# - %%if 0%%{?fedora} +# +# Be aware, on centos, both %%rhel and %%centos are set. If you want to test +# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition. +# (Don't forget to replace double percentage symbol with single one in order to apply a condition) + +# Generate devel rpm %global with_devel 1 +# Build project from bundled dependencies %global with_bundled 0 +# Build with debug info rpm %global with_debug 0 +# Run tests in check section %global with_check 1 +# Generate unit-test rpm %global with_unit_test 1 -%else -%global with_devel 0 -%global with_bundled 0 -%global with_debug 0 -%global with_check 0 -%global with_unit_test 0 -%endif %if 0%{?with_debug} %global _dwz_low_mem_die_limit 0 @@ -25,22 +36,23 @@ # https://github.com/milochristiansen/lua %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 68d5f07243f92541f65f6d6210404fff40448540 +%global commit 9cfe53dd9ceb6eec2638c96927350163705a4d4c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -# commit 68d5f07243f92541f65f6d6210404fff40448540 == version 1.1.3 +# commit 9cfe53dd9ceb6eec2638c96927350163705a4d4c == version 1.1.4 Name: golang-%{provider}-%{project}-%{repo} -Version: 1.1.3 -Release: 3%{?dist} +Version: 1.1.4 +Release: 1%{?dist} Summary: Lua 5.3 VM and compiler written in Go # License is confirmed to be zlib: https://github.com/milochristiansen/lua/issues/5 License: zlib URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{version}/%{project}-%{repo}-%{version}.tar.gz +Source0: https://%{provider_prefix}/archive/v%{version}/%{project}-%{repo}-%{version}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} +ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} + # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} @@ -103,23 +115,33 @@ install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list echo "%%dir %%{gopath}/src/%%{import_path}/vendor" >> devel.file-list # find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do - echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) +for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do + dirprefix=$(dirname $file) + install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list + + while [ "$dirprefix" != "." ]; do + echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list + dirprefix=$(dirname $dirprefix) + done done %endif # testing files for this project %if 0%{?with_unit_test} && 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -# find all *_test.go files and generate unit-test.file-list -for file in $(find . -iname "*_test.go"); do - echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) +# find all *_test.go files and generate unit-test-devel.file-list +for file in $(find . -iname "*_test.go") ; do + dirprefix=$(dirname $file) + install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list + + while [ "$dirprefix" != "." ]; do + echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list + dirprefix=$(dirname $dirprefix) + done done %endif @@ -144,16 +166,22 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath} %if 0%{?with_devel} %files devel -f devel.file-list +%license LICENSE %doc README.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %endif %if 0%{?with_unit_test} && 0%{?with_devel} %files unit-test-devel -f unit-test-devel.file-list +%license LICENSE %doc README.md %endif %changelog +* Mon Oct 23 2017 Ben Rosser - 1.1.4-1 +- Updated to latest upstream release (#1493534). +- Updated golang spec with new changes from gofed. + * Wed Aug 02 2017 Fedora Release Engineering - 1.1.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild @@ -176,4 +204,3 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath} * Fri Dec 30 2016 Ben Rosser - 1.0.2-1 - First package for Fedora -r diff --git a/sources b/sources index de302d8..d061abc 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (milochristiansen-lua-1.1.3.tar.gz) = 469fb1f487a453bb27d16ab8164b8303153f305f9be385bd6cdac108ccad2b13732caf82c29eb63fb8e872b934e4ec2c0fb59b7c7b736c4d3db36cf3b517b235 +SHA512 (milochristiansen-lua-1.1.4.tar.gz) = b2d7a8b3d06ce14ebda411ba7c7cf8af02b13ee7574fbb5039f28252e43e5b8bdf932c02870f63d3761854fca39835c1413b7bd2eca1a6c006ec5598bab5ed51