diff --git a/.gitignore b/.gitignore index f8f7afa..8d5ab75 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /otp-1.0.0.tar.gz +/otp-1.1.0.tar.gz diff --git a/golang-github-pquerna-otp.spec b/golang-github-pquerna-otp.spec index 34997a0..0b2d280 100644 --- a/golang-github-pquerna-otp.spec +++ b/golang-github-pquerna-otp.spec @@ -1,193 +1,74 @@ -# 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 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - +# Generated by go2rpm +%bcond_without check -%global provider github -%global provider_tld com -%global project pquerna -%global repo otp # https://github.com/pquerna/otp -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} +%global goipath github.com/pquerna/otp +Version: 1.1.0 -Name: golang-%{provider}-%{project}-%{repo} -Version: 1.0.0 -Release: 3%{?dist} -Summary: TOTP Library for Go (Golang) -License: ASL 2.0 -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/v%{version}/%{repo}-%{version}.tar.gz +%gometa -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -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} +%global common_description %{expand: +One Time Passwords (OTPs) are an mechanism to improve security over passwords +alone. When a Time-based OTP (TOTP) is stored on a user's phone, and combined +with something the user knows (Password), you have an easy on-ramp to +Multi-factor authentication without adding a dependency on a SMS provider. This +Password and TOTP combination is used by many popular websites including Google, +Github, Facebook, Salesforce and many others. +The otp library enables you to easily add TOTPs to your own application, +increasing your user's security against mass-password breaches and malware.} +Name: %{goname} +Release: 1%{?dist} +Summary: Totp library for go -%description -%{summary} +# Upstream license specification: Apache-2.0 +License: ASL 2.0 +URL: %{gourl} +Source0: %{gosource} -%if 0%{?with_devel} -%package devel -Summary: %{summary} -BuildArch: noarch +BuildRequires: golang(github.com/boombuler/barcode) +BuildRequires: golang(github.com/boombuler/barcode/qr) -%if 0%{?with_check} && ! 0%{?with_bundled} -BuildRequires: golang(github.com/boombuler/barcode) -BuildRequires: golang(github.com/boombuler/barcode/qr) +%if %{with check} +# Tests +BuildRequires: golang(github.com/stretchr/testify/assert) +BuildRequires: golang(github.com/stretchr/testify/require) %endif -Requires: golang(github.com/boombuler/barcode) -Requires: golang(github.com/boombuler/barcode/qr) +%description +%{common_description} -Provides: golang(%{import_path}) = %{version}-%{release} -Provides: golang(%{import_path}/hotp) = %{version}-%{release} -Provides: golang(%{import_path}/totp) = %{version}-%{release} +%package devel +Summary: %{summary} +BuildArch: noarch %description devel -%{summary} +%{common_description} This package contains library source intended for building other packages which use import path with -%{import_path} prefix. -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package -%if 0%{?with_check} -#Here comes all BuildRequires: PACKAGE the unit tests -#in %%check section need for running -%endif - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%if 0%{?with_check} && ! 0%{?with_bundled} -BuildRequires: golang(github.com/stretchr/testify/assert) -BuildRequires: golang(github.com/stretchr/testify/require) -%endif - -Requires: golang(github.com/stretchr/testify/assert) -Requires: golang(github.com/stretchr/testify/require) - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif +%{goipath} prefix. %prep -%setup -q -n %{repo}-%{version} +%forgeautosetup -p1 -%build %install -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list -# find all *.go but no *_test.go files and generate devel.file-list -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-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 - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif +%goinstall +%if %{with check} %check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -# No dependency directories so far - -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%endif - -%if ! 0%{?gotest:1} -%global gotest go test +%gochecks %endif -%gotest %{import_path} -%gotest %{import_path}/hotp -%gotest %{import_path}/totp -%endif - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - - -%if 0%{?with_devel} %files devel -f devel.file-list -%license LICENSE +%license LICENSE NOTICE %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 +* Sat Apr 06 18:08:34 CEST 2019 Robert-André Mauchin - 1.1.0-1 +- Release 1.1.0 (#1695320) + * Fri Jul 13 2018 Fedora Release Engineering - 1.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 4b51630..c8b0c63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-1.0.0.tar.gz) = a4698c07ca982e24a15a07d644657b7d39804985abef5ea437c1e039f14b6778d9e06b2252d9a67cac208a01a48374c5f026a7cd32100c1eb0e77a2ce9d7da7f +SHA512 (otp-1.1.0.tar.gz) = 6793513b57683b936b0f1348207e2be9716bff1caf62f5c0f98ba1ecc5ca4c8dc29be7782da885d0799e40fbfce41cc71d08f58c1dcb77f323ad283a6c3b619d