diff --git a/.gitignore b/.gitignore index 5a47264..74164a0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,3 @@ /age-1.1.0-rc.1.tar.gz /age-1.1.1.tar.gz /age-1.2.0.tar.gz -/age-1.2.1.tar.gz -/age-1.2.1-vendor.tar.bz2 -/age-1.3.0.tar.gz -/age-1.3.0-vendor.tar.bz2 -/age-1.3.1-vendor.tar.bz2 -/age-1.3.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index 3dda84b..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,35 +0,0 @@ -specfile_path: age.spec - -upstream_package_name: age -upstream_project_url: https://github.com/FiloSottile/age -downstream_package_name: age - -upstream_tag_template: v{version} - -jobs: - -- job: pull_from_upstream - trigger: release - dist_git_branches: - - rawhide - -- job: koji_build - trigger: commit - dist_git_branches: - - rawhide - -actions: - post-modifications: - # https://fedora.gitlab.io/sigs/go/go-vendor-tools/scenarios/#manual-update - - | - sh -xeuc " - cd $PACKIT_DOWNSTREAM_REPO - export GOTOOLCHAIN=auto - go_vendor_archive create --config go-vendor-tools.toml age.spec - go_vendor_license \ - --config go-vendor-tools.toml \ - --path age.spec \ - report \ - --verify-spec - " -create_sync_note: false diff --git a/age.spec b/age.spec index b6dd710..15d219a 100644 --- a/age.spec +++ b/age.spec @@ -1,75 +1,94 @@ -# Generated by go2rpm 1.18.0 +# Generated by go2rpm 1.14.0 %bcond check 1 +%bcond bootstrap 0 + +%if %{with bootstrap} +%global debug_package %{nil} +%endif + +%if %{with bootstrap} +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^golang\\(.*\\)$ +%endif # https://github.com/FiloSottile/age %global goipath filippo.io/age %global forgeurl https://github.com/FiloSottile/age -Version: 1.3.1 +Version: 1.2.0 %gometa -L -f +%global common_description %{expand: +A simple, modern and secure encryption tool (and Go library) with small +explicit keys, no config options, and UNIX-style composability.} + +%global golicenses LICENSE +%global godocs AUTHORS README.md Name: age Release: %autorelease Summary: Simple, modern and secure encryption tool -# Generated by go-vendor-tools -# https://github.com/C2SP/CCTV/issues/14 -# vendor/c2sp.org/CCTV/age/internal is not packaged -License: BSD-3-Clause AND (0BSD OR CC0-1.0 OR Unlicense) +License: BSD-3-Clause URL: %{gourl} -Source0: %{gosource} -# Generated by go-vendor-tools -Source1: %{archivename}-vendor.tar.bz2 -Source2: go-vendor-tools.toml +Source: %{gosource} -BuildRequires: go-vendor-tools +%description %{common_description} -%description -A simple, modern and secure encryption tool (and Go library) with small -explicit keys, no config options, and UNIX-style composability. +%gopkg %prep %goprep -A -%setup -q -T -D -a1 %{forgesetupargs} %autopatch -p1 -%generate_buildrequires -%go_vendor_license_buildrequires -c %{S:2} +# To avoid extra dep on c2sp.org/CCTV/age +rm -rfv testkit_test.go +%if %{without bootstrap} +%generate_buildrequires +%go_generate_buildrequires +%endif + +%if %{without bootstrap} %build -%global gomodulesmode GO111MODULE=on -GO_LDFLAGS="-X main.Version=%{version}" -for cmd in cmd/{age,age-keygen,age-inspect} ; do +for cmd in cmd/* ; do %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd done +%endif %install -%go_vendor_license_install -c %{S:2} +%gopkginstall +%if %{without bootstrap} install -m 0755 -vd %{buildroot}%{_bindir} install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ mkdir -p %{buildroot}%{_mandir}/man1 install -m 644 doc/%{name}.1 %{buildroot}%{_mandir}/man1/ install -m 644 doc/age-keygen.1 %{buildroot}%{_mandir}/man1/ -install -m 644 doc/age-inspect.1 %{buildroot}%{_mandir}/man1/ - -%check -%go_vendor_license_check -c %{S:2} -%if %{with check} -%gotest ./... %endif -%files -f %{go_vendor_license_filelist} -%license vendor/modules.txt -%doc doc README.md -%{_bindir}/age -%{_bindir}/age-inspect -%{_bindir}/age-keygen -%{_mandir}/man1/age.1* -%{_mandir}/man1/age-inspect.1* -%{_mandir}/man1/age-keygen.1* +%if %{without bootstrap} +%if %{with check} +%check +%ifarch s390x +for test in "TestScript" \ +; do +awk -i inplace '/^func.*'"$test"'\(/ { print; print "\tt.Skip(\"disabled failing test\")"; next}1' $(grep -rl $test) +done +%endif +%gocheck +%endif +%endif +%if %{without bootstrap} +%files +%license LICENSE +%doc doc AUTHORS README.md +%{_bindir}/age +%{_bindir}/age-keygen +%{_mandir}/man1/* +%endif + +%gopkgfiles %changelog %autochangelog diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml deleted file mode 100644 index 9c9f1d2..0000000 --- a/go-vendor-tools.toml +++ /dev/null @@ -1,9 +0,0 @@ - -[archive] - -[licensing] -detector = "askalono" -[[licensing.licenses]] -path = "vendor/c2sp.org/CCTV/age/README.md" -sha256sum = "fdbd4b06044f3803c72bdaf2df7681fdce3a45a326a2898e75640eae906606ad" -expression = "0BSD OR CC0-1.0 OR Unlicense" diff --git a/sources b/sources index 65f5af2..49df8a8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (age-1.3.1-vendor.tar.bz2) = c0863d04a2206e4f18ffb4d3b0429fc33685e4e7be1ffac7eca2218af590218ad62776fe11f60258092921f3aafffd6962d720eeeb6dd0ea68a14b39730c3908 -SHA512 (age-1.3.1.tar.gz) = 95bb8049de36630f0b128c9626427646e5d4d76e35b6bd6790e29cf3f69fb2a0266ac7786616f56fe9bf378a81c1f3edc17fd9eba197286041b970944898504c +SHA512 (age-1.2.0.tar.gz) = fddc7e6a68115d52f4b98957ef87a82cbf634ba38a028fb113370392d88af3e8b32991baabc1595280ecbd8e44bbc88dcea93e7336e7ffa2cbccfea0c953842f