Architecture specific change in rpms/xsimd.git
by githook-noreply＠fedoraproject.org
The package rpms/xsimd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xsimd.git/commit/?id=d49d34bdbade....
Change:
+%ifarch armv7l armv7hl armv7hnl
Thanks.
Full change:
============
commit 64a5b5bbd9a3be4b8113b76b5b311aeb2fc685dc
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Wed Jul 3 19:45:30 2019 +0200
Reenable tests (commented out by mistake)
diff --git a/xsimd.spec b/xsimd.spec
index cdc19df..b7a1b06 100644
--- a/xsimd.spec
+++ b/xsimd.spec
@@ -56,8 +56,8 @@ Provides: %{name}-static = %{version}-%{release}
%install
%make_install
-#check
-#make_build xtest
+%check
+%make_build xtest
%files devel
%doc README.md
@@ -68,6 +68,7 @@ Provides: %{name}-static = %{version}-%{release}
%changelog
* Wed Jul 03 2019 Miro Hronok <mhroncok(a)redhat.com> - 7.2.3-2
- Apply upstream workaround for armv7
+- Reenable tests (commented out by mistake)
* Fri Jun 28 2019 Miro Hronok <mhroncok(a)redhat.com> - 7.2.3-1
- Initial package
commit d49d34bdbade7b7e6379d42d23b02d67625cdab0
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Wed Jul 3 19:45:11 2019 +0200
Apply upstream workaround for armv7
diff --git a/292.patch b/292.patch
new file mode 100644
index 0000000..acfd05e
--- /dev/null
+++ b/292.patch
@@ -0,0 +1,419 @@
+From da7ab060cbcf57a20adf1c7d5b013658183f8bc5 Mon Sep 17 00:00:00 2001
+From: Johan Mabille <johan.mabille(a)gmail.com>
+Date: Wed, 3 Jul 2019 17:09:58 +0200
+Subject: [PATCH] Disabled most of the tests when no SIMD instruction set is
+ available
+
+---
+ .travis.yml | 11 ++++++++++
+ .../xsimd/config/xsimd_instruction_set.hpp | 8 ++++---
+ include/xsimd/memory/xsimd_alignment.hpp | 2 +-
+ include/xsimd/memory/xsimd_load_store.hpp | 2 +-
+ include/xsimd/types/xsimd_types_include.hpp | 2 +-
+ test/xsimd_algorithms.cpp | 22 +++++++++++++------
+ test/xsimd_api_test.cpp | 2 +-
+ test/xsimd_basic_math_test.cpp | 5 ++++-
+ test/xsimd_error_gamma_test.cpp | 5 ++++-
+ test/xsimd_exponential_test.cpp | 5 ++++-
+ test/xsimd_fp_manipulation_test.cpp | 5 ++++-
+ test/xsimd_hyperbolic_test.cpp | 5 ++++-
+ test/xsimd_interface_test.cpp | 3 +++
+ test/xsimd_memory_test.cpp | 3 +++
+ test/xsimd_power_test.cpp | 5 ++++-
+ test/xsimd_rounding_test.cpp | 5 ++++-
+ test/xsimd_trigonometric_test.cpp | 5 ++++-
+ 17 files changed, 73 insertions(+), 22 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index d155b05..36bd25d 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -18,6 +18,14 @@ matrix:
+ packages:
+ - g++-5
+ env: COMPILER=gcc GCC=5
++ - os: linux
++ addons:
++ apt:
++ sources:
++ - ubuntu-toolchain-r-test
++ packages:
++ - g++-6
++ env: COMPILER=gcc GCC=6 FORCE_NO_INSTR_SET=1
+ - os: linux
+ addons:
+ apt:
+@@ -175,6 +183,9 @@ install:
+ else
+ cmake . -DDOWNLOAD_GTEST=ON ;
+ fi
++ - if [[ "$FORCE_NO_INSTR_SET" == 1 ]] ; then
++ cmake . -DDOWNLOAD_GTEST=ON -DXSIMD_FORCE_X86_INSTR_SET=0 ;
++ fi
+ - make -j2 test_xsimd
+ - cd test
+ script:
+diff --git a/include/xsimd/config/xsimd_instruction_set.hpp b/include/xsimd/config/xsimd_instruction_set.hpp
+index ca0f1c1..627537b 100644
+--- a/include/xsimd/config/xsimd_instruction_set.hpp
++++ b/include/xsimd/config/xsimd_instruction_set.hpp
+@@ -138,7 +138,9 @@
+ * PPC INSTRUCTION SET *
+ ***********************/
+
+-#define XSIMD_PPC_VMX_VERSION XSIMD_VERSION_NUMBER(1, 0, 0)
++// We haven't implemented any support for PPC, so we should
++// not enable detection for this instructoin set
++/*#define XSIMD_PPC_VMX_VERSION XSIMD_VERSION_NUMBER(1, 0, 0)
+ #define XSIMD_PPC_VSX_VERSION XSIMD_VERSION_NUMBER(1, 1, 0)
+ #define XSIMD_PPC_QPX_VERSION XSIMD_VERSION_NUMBER(2, 0, 0)
+
+@@ -161,7 +163,7 @@
+ #define XSIMD_PPC_INSTR_SET XSIMD_VERSION_NUMBER_NOT_AVAILABLE
+ #else
+ #define XSIMD_PPC_INSTR_SET_AVAILABLE XSIMD_VERSION_NUMBER_AVAILABLE
+-#endif
++#endif*/
+
+ /***********************
+ * ARM INSTRUCTION SET *
+@@ -224,7 +226,7 @@
+
+ #if !defined(XSIMD_INSTR_SET)
+ #define XSIMD_INSTR_SET XSIMD_VERSION_NUMBER_NOT_AVAILABLE
+-#else
++#elif XSIMD_INSTR_SET != XSIMD_VERSION_NUMBER_NOT_AVAILABLE
+ #define XSIMD_INSTR_SET_AVAILABLE XSIMD_VERSION_NUMBER_AVAILABLE
+ #endif
+
+diff --git a/include/xsimd/memory/xsimd_alignment.hpp b/include/xsimd/memory/xsimd_alignment.hpp
+index bff50ea..301d72a 100644
+--- a/include/xsimd/memory/xsimd_alignment.hpp
++++ b/include/xsimd/memory/xsimd_alignment.hpp
+@@ -40,7 +40,7 @@ namespace xsimd
+ using type = unaligned_mode;
+ };
+
+-#if defined(XSIMD_X86_INSTR_SET_AVAILABLE) || defined(XSIMD_ARM_INSTR_SET_AVAILABLE)
++#if defined(XSIMD_DEFAULT_ALIGNMENT)
+ template <class T>
+ struct allocator_alignment<aligned_allocator<T, XSIMD_DEFAULT_ALIGNMENT>>
+ {
+diff --git a/include/xsimd/memory/xsimd_load_store.hpp b/include/xsimd/memory/xsimd_load_store.hpp
+index b4b6773..45d5e33 100644
+--- a/include/xsimd/memory/xsimd_load_store.hpp
++++ b/include/xsimd/memory/xsimd_load_store.hpp
+@@ -598,7 +598,7 @@ namespace xsimd
+ {
+ }
+
+-#if defined(XSIMD_X86_INSTR_SET_AVAILABLE)
++#if XSIMD_X86_INSTR_SET > XSIMD_INSTR_SET_NOT_AVAILABLE
+
+ template <>
+ inline void prefetch<int32_t>(const int32_t* address)
+diff --git a/include/xsimd/types/xsimd_types_include.hpp b/include/xsimd/types/xsimd_types_include.hpp
+index 39f0a2d..965320c 100644
+--- a/include/xsimd/types/xsimd_types_include.hpp
++++ b/include/xsimd/types/xsimd_types_include.hpp
+@@ -67,7 +67,7 @@
+ #include "xsimd_neon_complex.hpp"
+ #endif
+
+-#if XSIMD_ARM_INSTR_SET == XSIMD_VERSION_NUMBER_NOT_AVAILABLE && XSIMD_X86_INSTR_SET == XSIMD_VERSION_NUMBER_NOT_AVAILABLE
++#if !defined(XSIMD_INSTR_SET_AVAILABLE)
+ #if defined(XSIMD_ENABLE_FALLBACK)
+ #warning "No SIMD instructions enabled, using fallback mode."
+ #else
+diff --git a/test/xsimd_algorithms.cpp b/test/xsimd_algorithms.cpp
+index 75f4e8c..07a4ff1 100644
+--- a/test/xsimd_algorithms.cpp
++++ b/test/xsimd_algorithms.cpp
+@@ -32,12 +32,20 @@ struct unary_functor
+ }
+ };
+
++#ifdef XSIMD_DEFAULT_ALIGNMENT
++template <class T>
++using test_allocator_type = xsimd::aligned_allocator<T, XSIMD_DEFAULT_ALIGNMENT>;
++#else
++template <class T>
++using test_allocator_type = std::allocator<T>;
++#endif
++
+ TEST(xsimd, binary_transform)
+ {
+ std::vector<double> expected(93);
+
+ std::vector<double> a(93, 123), b(93, 123), c(93);
+- std::vector<double, xsimd::aligned_allocator<double, XSIMD_DEFAULT_ALIGNMENT>> aa(93, 123), ba(93, 123), ca(93);
++ std::vector<double, test_allocator_type<double>> aa(93, 123), ba(93, 123), ca(93);
+
+ std::transform(a.begin(), a.end(), b.begin(), expected.begin(),
+ binary_functor{});
+@@ -83,7 +91,7 @@ TEST(xsimd, unary_transform)
+ {
+ std::vector<double> expected(93);
+ std::vector<double> a(93, 123), c(93);
+- std::vector<double, xsimd::aligned_allocator<double, XSIMD_DEFAULT_ALIGNMENT>> aa(93, 123), ca(93);
++ std::vector<double, test_allocator_type<double>> aa(93, 123), ca(93);
+
+ std::transform(a.begin(), a.end(), expected.begin(),
+ unary_functor{});
+@@ -112,7 +120,7 @@ TEST(xsimd, unary_transform)
+ class xsimd_reduce : public ::testing::Test
+ {
+ public:
+- using aligned_vec_t = std::vector<double, xsimd::aligned_allocator<double, XSIMD_DEFAULT_ALIGNMENT>>;
++ using aligned_vec_t = std::vector<double, test_allocator_type<double>>;
+
+ static constexpr std::size_t num_elements = 4 * xsimd::simd_traits<double>::size;
+ static constexpr std::size_t small_num = xsimd::simd_traits<double>::size - 1;
+@@ -211,11 +219,10 @@ TEST_F(xsimd_reduce, using_custom_binary_function)
+ }
+ }
+
++#if XSIMD_X86_INSTR_SET > XSIMD_VERSION_NUMBER_NOT_AVAILABLE || XSIMD_ARM_INSTR_SET > XSIMD_VERSION_NUMBER_NOT_AVAILABLE
+ TEST(xsimd, iterator)
+ {
+- std::vector<float, xsimd::aligned_allocator<float, XSIMD_DEFAULT_ALIGNMENT>> a(10 * 16, 0.2);
+- std::vector<float, xsimd::aligned_allocator<float, XSIMD_DEFAULT_ALIGNMENT>> b(1000, 2.);
+- std::vector<float, xsimd::aligned_allocator<float, XSIMD_DEFAULT_ALIGNMENT>> c(1000, 3.);
++ std::vector<float, test_allocator_type<float>> a(10 * 16, 0.2), b(1000, 2.), c(1000, 3.);
+
+ std::iota(a.begin(), a.end(), 0.f);
+ std::vector<float> a_cpy(a.begin(), a.end());
+@@ -245,7 +252,7 @@ TEST(xsimd, iterator)
+ }
+
+ #ifdef XSIMD_BATCH_DOUBLE_SIZE
+- std::vector<std::complex<double>, xsimd::aligned_allocator<std::complex<double>, XSIMD_DEFAULT_ALIGNMENT>> ca(10 * 16, std::complex<double>(0.2));
++ std::vector<std::complex<double>, test_allocator_type<std::complex<double>>> ca(10 * 16, std::complex<double>(0.2));
+ using cbatch_type = typename xsimd::simd_traits<std::complex<double>>::type;
+ auto cbegin = xsimd::aligned_iterator<cbatch_type>(&ca[0]);
+ auto cend = xsimd::aligned_iterator<cbatch_type>(&ca[0] + a.size());
+@@ -262,3 +269,4 @@ TEST(xsimd, iterator)
+ #endif
+
+ }
++#endif
+diff --git a/test/xsimd_api_test.cpp b/test/xsimd_api_test.cpp
+index 74fbcbb..f224214 100644
+--- a/test/xsimd_api_test.cpp
++++ b/test/xsimd_api_test.cpp
+@@ -36,7 +36,7 @@ namespace xsimd
+ }
+ }
+
+-#if XSIMD_X86_INSTR_SET_AVAILABLE > XSIMD_VERSION_NUMBER_NOT_AVAILABLE
++#if XSIMD_X86_INSTR_SET > XSIMD_VERSION_NUMBER_NOT_AVAILABLE
+ TEST(xsimd, complex_return_type)
+ {
+ using cf_type = std::complex<float>;
+diff --git a/test/xsimd_basic_math_test.cpp b/test/xsimd_basic_math_test.cpp
+index cd62bc0..b192f1b 100644
+--- a/test/xsimd_basic_math_test.cpp
++++ b/test/xsimd_basic_math_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/math/xsimd_basic_math.hpp"
+ #include "xsimd/memory/xsimd_aligned_allocator.hpp"
+ #include "xsimd/types/xsimd_types_include.hpp"
+@@ -105,4 +107,5 @@ TEST(xsimd, fallback_double_basic_math)
+ bool res = xsimd::test_basic_math<double, 3, 32>(out, "fallback double");
+ EXPECT_TRUE(res);
+ }
+-#endif
+\ No newline at end of file
++#endif
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_error_gamma_test.cpp b/test/xsimd_error_gamma_test.cpp
+index 8241ef3..c70904b 100644
+--- a/test/xsimd_error_gamma_test.cpp
++++ b/test/xsimd_error_gamma_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/math/xsimd_error.hpp"
+ #include "xsimd/math/xsimd_gamma.hpp"
+ #include "xsimd/memory/xsimd_aligned_allocator.hpp"
+@@ -106,4 +108,5 @@ TEST(xsimd, fallback_double_error_gamma)
+ bool res = xsimd::test_error_gamma<double, 3, 32>(out, "fallback double");
+ EXPECT_TRUE(res);
+ }
+-#endif
+\ No newline at end of file
++#endif
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_exponential_test.cpp b/test/xsimd_exponential_test.cpp
+index 7a6f4b3..43ec983 100644
+--- a/test/xsimd_exponential_test.cpp
++++ b/test/xsimd_exponential_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/math/xsimd_exponential.hpp"
+ #include "xsimd/math/xsimd_logarithm.hpp"
+ #include "xsimd/memory/xsimd_aligned_allocator.hpp"
+@@ -106,4 +108,5 @@ TEST(xsimd, fallback_double_exponential)
+ bool res = xsimd::test_exponential<double, 3, 32>(out, "fallback double");
+ EXPECT_TRUE(res);
+ }
+-#endif
+\ No newline at end of file
++#endif
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_fp_manipulation_test.cpp b/test/xsimd_fp_manipulation_test.cpp
+index c2d7f67..d19ed3e 100644
+--- a/test/xsimd_fp_manipulation_test.cpp
++++ b/test/xsimd_fp_manipulation_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/math/xsimd_fp_manipulation.hpp"
+ #include "xsimd/memory/xsimd_aligned_allocator.hpp"
+ #include "xsimd/types/xsimd_types_include.hpp"
+@@ -105,4 +107,5 @@ TEST(xsimd, fallback_double_fp_manipulation)
+ bool res = xsimd::test_fp_manipulation<double, 3, 32>(out, "fallback double");
+ EXPECT_TRUE(res);
+ }
+-#endif
+\ No newline at end of file
++#endif
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_hyperbolic_test.cpp b/test/xsimd_hyperbolic_test.cpp
+index 23f2506..9a76ec4 100644
+--- a/test/xsimd_hyperbolic_test.cpp
++++ b/test/xsimd_hyperbolic_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/math/xsimd_hyperbolic.hpp"
+ #include "xsimd/memory/xsimd_aligned_allocator.hpp"
+ #include "xsimd/types/xsimd_types_include.hpp"
+@@ -105,4 +107,5 @@ TEST(xsimd, fallback_double_hyperbolic)
+ bool res = xsimd::test_hyperbolic<double, 3, 32>(out, "fallback double");
+ EXPECT_TRUE(res);
+ }
+-#endif
+\ No newline at end of file
++#endif
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_interface_test.cpp b/test/xsimd_interface_test.cpp
+index ebbfe44..976b04a 100644
+--- a/test/xsimd_interface_test.cpp
++++ b/test/xsimd_interface_test.cpp
+@@ -12,6 +12,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/xsimd.hpp"
+
+ namespace xsimd
+@@ -109,3 +111,4 @@ namespace xsimd
+ EXPECT_EQ(t.ivec, t.ires);
+ }
+ }
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_memory_test.cpp b/test/xsimd_memory_test.cpp
+index 754c5ec..1e48762 100644
+--- a/test/xsimd_memory_test.cpp
++++ b/test/xsimd_memory_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/memory/xsimd_alignment.hpp"
+
+ namespace xsimd
+@@ -31,3 +33,4 @@ namespace xsimd
+ EXPECT_TRUE((std::is_same<mock_align, unaligned_mode>::value));
+ }
+ }
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_power_test.cpp b/test/xsimd_power_test.cpp
+index 99475c6..3b6376a 100644
+--- a/test/xsimd_power_test.cpp
++++ b/test/xsimd_power_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/math/xsimd_power.hpp"
+ #include "xsimd/memory/xsimd_aligned_allocator.hpp"
+ #include "xsimd/types/xsimd_types_include.hpp"
+@@ -105,4 +107,5 @@ TEST(xsimd, fallback_double_power)
+ bool res = xsimd::test_power<double, 3, 32>(out, "fallback double");
+ EXPECT_TRUE(res);
+ }
+-#endif
+\ No newline at end of file
++#endif
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_rounding_test.cpp b/test/xsimd_rounding_test.cpp
+index 420ca3a..7fca3e4 100644
+--- a/test/xsimd_rounding_test.cpp
++++ b/test/xsimd_rounding_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/math/xsimd_rounding.hpp"
+ #include "xsimd/memory/xsimd_aligned_allocator.hpp"
+ #include "xsimd/types/xsimd_types_include.hpp"
+@@ -105,4 +107,5 @@ TEST(xsimd, fallback_double_rounding)
+ bool res = xsimd::test_rounding<double, 3, 32>(out, "fallback double");
+ EXPECT_TRUE(res);
+ }
+-#endif
+\ No newline at end of file
++#endif
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_trigonometric_test.cpp b/test/xsimd_trigonometric_test.cpp
+index 2fba7f9..9998711 100644
+--- a/test/xsimd_trigonometric_test.cpp
++++ b/test/xsimd_trigonometric_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/math/xsimd_trigonometric.hpp"
+ #include "xsimd/memory/xsimd_aligned_allocator.hpp"
+ #include "xsimd/types/xsimd_types_include.hpp"
+@@ -105,4 +107,5 @@ TEST(xsimd, fallback_double_trigonometric)
+ bool res = xsimd::test_trigonometric<double, 3, 32>(out, "fallback double");
+ EXPECT_TRUE(res);
+ }
+-#endif
+\ No newline at end of file
++#endif
++#endif // XSIMD_INSTR_SET_AVAILABLE
+--
+2.21.0
+
diff --git a/xsimd.spec b/xsimd.spec
index e66f98d..cdc19df 100644
--- a/xsimd.spec
+++ b/xsimd.spec
@@ -1,12 +1,16 @@
Name: xsimd
Version: 7.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: C++ wrappers for SIMD intrinsics
License: BSD
URL: https://xsimd.readthedocs.io/
%global github https://github.com/QuantStack/xsimd
Source0: %{github}/archive/%{version}/%{name}-%{version}.tar.gz
+# Workaround for armv7hl build failures
+# https://github.com/QuantStack/xsimd/pull/292 rebased
+Patch1: 292.patch
+
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: gtest-devel
@@ -15,7 +19,7 @@ BuildRequires: gtest-devel
%global debug_package %{nil}
# https://github.com/QuantStack/xsimd/issues/289
-ExcludeArch: armv7hl ppc64le s390x
+ExcludeArch: ppc64le s390x
%global _description \
SIMD (Single Instruction, Multiple Data) is a feature of microprocessors that \
@@ -39,10 +43,14 @@ Provides: %{name}-static = %{version}-%{release}
%prep
-%autosetup
+%autosetup -p1
%build
-%cmake -DBUILD_TESTS=ON .
+%cmake -DBUILD_TESTS=ON \
+%ifarch armv7l armv7hl armv7hnl
+-DXSIMD_FORCE_ARM_INSTR_SET=70000000 \
+%endif
+.
%make_build
%install
@@ -58,5 +66,8 @@ Provides: %{name}-static = %{version}-%{release}
%{_libdir}/cmake/%{name}/
%changelog
+* Wed Jul 03 2019 Miro Hronok <mhroncok(a)redhat.com> - 7.2.3-2
+- Apply upstream workaround for armv7
+
* Fri Jun 28 2019 Miro Hronok <mhroncok(a)redhat.com> - 7.2.3-1
- Initial package
4 years, 10 months
Architecture specific change in rpms/golang-github-rakyll-globalconf.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-rakyll-globalconf.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-rakyll-globalconf.g....
Change:
-%ifarch 0%{?gccgo_arches}
Thanks.
Full change:
============
commit 5b8002fe43dd0007d0699b735d3664460faa9918
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Sun Jun 2 17:50:34 2019 +0200
Bump to commit 87f8127c421f4ccdaac33c9fca40c305c654f1de
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 1c7f7b7..e6041b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/globalconf-415abc3.tar.gz
+/globalconf-87f8127c421f4ccdaac33c9fca40c305c654f1de.tar.gz
diff --git a/golang-github-rakyll-globalconf.spec b/golang-github-rakyll-globalconf.spec
index da9cc12..677183d 100644
--- a/golang-github-rakyll-globalconf.spec
+++ b/golang-github-rakyll-globalconf.spec
@@ -1,180 +1,53 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%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
-%else
-%global debug_package %{nil}
-%endif
-
-%define copying() \
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 \
-%license %{*} \
-%else \
-%doc %{*} \
-%endif
+# Generated by go2rpm
+%bcond_without check
-%global provider github
-%global provider_tld com
-%global project rakyll
-%global repo globalconf
# https://github.com/rakyll/globalconf
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 415abc325023f1a00cd2d9fa512e0e71745791a2
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global goipath github.com/rakyll/globalconf
+%global commit 87f8127c421f4ccdaac33c9fca40c305c654f1de
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.12.git%{shortcommit}%{?dist}
-Summary: Effortlessly persist and read flag values from an ini config file
-License: ASL 2.0
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# If go_arches not defined fall through to implicit golang archs
-%if 0%{?go_arches:1}
-ExclusiveArch: %{go_arches}
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm}
-%endif
-# If gccgo_arches does not fit or is not defined fall through to golang
-%ifarch 0%{?gccgo_arches}
-BuildRequires: gcc-go >= %{gccgo_min_vers}
-%else
-BuildRequires: golang
-%endif
+%gometa
-%description
-%{summary}
+%global common_description %{expand:
+Effortlessly persist/retrieve flags of your Golang programs. If you need global
+configuration instead of requiring user always to set command line flags, you
+are looking at the right package. globalconf allows your users to not only
+provide flags, but config files and environment variables as well.}
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
+%global godocs README.md
-%if 0%{?with_check}
-BuildRequires: golang(github.com/rakyll/goini)
-%endif
-
-Requires: golang(github.com/rakyll/goini)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
-%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test}
-%package unit-test
-Summary: Unit tests for %{name} package
-# If go_arches not defined fall through to implicit golang archs
-%if 0%{?go_arches:1}
-ExclusiveArch: %{go_arches}
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm}
-%endif
-# If gccgo_arches does not fit or is not defined fall through to golang
-%ifarch 0%{?gccgo_arches}
-BuildRequires: gcc-go >= %{gccgo_min_vers}
-%else
-BuildRequires: golang
-%endif
+Name: %{goname}
+Version: 0
+Release: 0.13%{?dist}
+Summary: Persist flag values into an ini file
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
+License: # FIXME
+URL: %{gourl}
+Source0: %{gosource}
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
+BuildRequires: golang(github.com/glacjay/goini)
-%description unit-test
-%{summary}
+%description
+%{common_description}
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%gopkg
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%goprep
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test}
-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
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-for file in ./testdata/*; do
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-%endif
+%gopkginstall
+%if %{with check}
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%ifarch 0%{?gccgo_arches}
-function gotest { %{gcc_go_test} "$@"; }
-%else
-%if 0%{?golang_test:1}
-function gotest { %{golang_test} "$@"; }
-%else
-function gotest { go test "$@"; }
-%endif
-%endif
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-gotest %{import_path}
-%endif
-
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%copying
-%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%dir %{gopath}/src/%{import_path}
+%gocheck
%endif
-%if 0%{?with_unit_test}
-%files unit-test -f unit-test.file-list
-%copying
-%doc README.md
-%endif
+%gopkgfiles
%changelog
+* Sun Jun 02 17:44:18 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0-0.13.20190602git87f8127
+- Bump to commit 87f8127c421f4ccdaac33c9fca40c305c654f1de
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.12.git415abc3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
@@ -212,4 +85,3 @@ gotest %{import_path}
* Sat Dec 27 2014 jchaloup <jchaloup(a)redhat.com> - 0-0.1.git415abc3
- First package for Fedora
resolves: #1177487
-
diff --git a/sources b/sources
index 6c3531d..2fb17b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32aff790330eea726a1daf76689870fd globalconf-415abc3.tar.gz
+SHA512 (globalconf-87f8127c421f4ccdaac33c9fca40c305c654f1de.tar.gz) = a76997e915049ad8e0551ebaf50002df6df1ae82c6638737fa879241977f01a82d9f523b27464af535fc870dd440cfc784e5f73e162ccbfbb0d64a77c538fdef
4 years, 10 months
Architecture specific change in rpms/golang-github-muesli-smartcrop.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-muesli-smartcrop.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-muesli-smartcrop.gi....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 1232ee646705e856b21d711c85dae752b8b0f825
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Sun Jun 2 16:39:40 2019 +0200
Release 0.3.0
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 4ee8880..28dfc4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/smartcrop-c6b1bf0.tar.gz
/smartcrop-1db4849.tar.gz
+/smartcrop-0.3.0.tar.gz
diff --git a/golang-github-muesli-smartcrop.spec b/golang-github-muesli-smartcrop.spec
index e117f0f..a8fb0a2 100644
--- a/golang-github-muesli-smartcrop.spec
+++ b/golang-github-muesli-smartcrop.spec
@@ -1,195 +1,54 @@
-# 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 muesli
-%global repo smartcrop
# https://github.com/muesli/smartcrop
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 1db484956b9ef929344e51701299a017beefdaaa
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0.2.0
-Release: 5.20180220git1db4849%{?dist}
-Summary: Find good image crops for arbitrary crop sizes
-# While the package is licensed under MIT, images under the examples directory
-# are licensed as CC-BY-SA
-License: MIT and CC-BY-SA
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+%global goipath github.com/muesli/smartcrop
+Version: 0.3.0
-# 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}
+%gometa
+%global common_description %{expand:
+Smartcrop finds good image crops for arbitrary sizes. It is a pure Go
+implementation, based on Jonas Wagner's smartcrop.js}
+%global golicenses LICENSE
+%global godocs examples README.md
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(github.com/nfnt/resize)
-BuildRequires: golang(golang.org/x/image/draw)
-%endif
-
-Requires: golang(github.com/nfnt/resize)
-Requires: golang(golang.org/x/image/draw)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
-%description devel
-%{summary}
-
-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}
+Name: %{goname}
+Release: 1%{?dist}
+Summary: Find good image crops for arbitrary crop sizes
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
+# While the package is licensed under MIT, images under the examples directory
+# are licensed as CC-BY-SA
+License: MIT and CC-BY-SA
+URL: %{gourl}
+Source0: %{gosource}
+BuildRequires: golang(github.com/nfnt/resize)
+BuildRequires: golang(golang.org/x/image/draw)
-%description unit-test-devel
-%{summary}
+%description
+%{common_description}
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%gopkg
%prep
-%setup -q -n %{repo}-%{commit}
+%goprep
-%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
-# install data used for tests
-cp -pav ./examples %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%{gopath}/src/%%{import_path}/examples" >> unit-test-devel.file-list
-
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%gopkginstall
+%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}
+%gocheck
%endif
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-# Clean after tests
-rm -f %{buildroot}/%{gopath}/src/%{import_path}/smartcrop.jpg
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-
-%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
+%gopkgfiles
%changelog
+* Sun Jun 02 16:32:14 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0.3.0-1
+- Release 0.3.0
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-5.20180220git1db4849
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index 6fc3b4e..d6f7762 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (smartcrop-1db4849.tar.gz) = 1933e5ad1059046ccebb16d020782774e58ea74069c6f17e9017a4868be885e09defa8ca5131fdd7a458b1b8ba09c1e2a817d4e0822581d1c7e3bc8c85edb872
+SHA512 (smartcrop-0.3.0.tar.gz) = 0a27b84e36023003d06ec8fa8d7877039f0be76542da7df365b48e9e46d74ae48947ddc286432f485f83faf5a8e2bfcdd1060a6e27b6f5f03e3d5f37c09df983
4 years, 10 months
Architecture specific change in rpms/golang-github-michaelklishin-rabbit-hole.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-michaelklishin-rabbit-hole.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-michaelklishin-rabb....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit c9604e39fe43be6a04adccdf522adb1409aba869
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Sat Jun 1 23:20:59 2019 +0200
Release 2.0.0-rc.2
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index b46f4e8..89e72f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/rabbit-hole-1.4.0.tar.gz
+/rabbit-hole-2.0.0-rc.2.tar.gz
diff --git a/golang-github-michaelklishin-rabbit-hole.spec b/golang-github-michaelklishin-rabbit-hole.spec
index e20cb8d..5aa9b96 100644
--- a/golang-github-michaelklishin-rabbit-hole.spec
+++ b/golang-github-michaelklishin-rabbit-hole.spec
@@ -1,190 +1,58 @@
-# 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
-# tests assume a running RabbitMQ server
-%global with_check 0
-# Generate unit-test rpm
-%global with_unit_test 0
-
-%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 michaelklishin
-%global repo rabbit-hole
# https://github.com/michaelklishin/rabbit-hole
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 1.4.0
-Release: 4%{?dist}
-Summary: RabbitMQ HTTP API client in Go
-# Detected licences
-# - BSD (2 clause) at 'LICENSE'
-License: BSD
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/v%{version}/%{repo}-%{version}.tar.gz
+%global goipath github.com/michaelklishin/rabbit-hole
+Version: 2.0.0
+%global tag v2.0.0-rc.2
-# 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}
+%gometa
+%global common_description %{expand:
+This library is a RabbitMQ HTTP API client for the Go language.}
+%global golicenses LICENSE
+%global godocs CONTRIBUTING.md ChangeLog.md README.md
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
-
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
-%description devel
-%{summary}
-
-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}
+Name: %{goname}
+Release: 1.rc.2%{?dist}
+Summary: RabbitMQ HTTP API client in Go
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(github.com/onsi/ginkgo)
-BuildRequires: golang(github.com/onsi/gomega)
-BuildRequires: golang(github.com/streadway/amqp)
+# Upstream license specification: BSD-2-Clause
+License: BSD
+URL: %{gourl}
+Source0: %{gosource}
+
+%if %{with check}
+# Tests
+BuildRequires: golang(github.com/onsi/ginkgo)
+BuildRequires: golang(github.com/onsi/gomega)
+BuildRequires: golang(github.com/streadway/amqp)
%endif
-Requires: golang(github.com/onsi/ginkgo)
-Requires: golang(github.com/onsi/gomega)
-Requires: golang(github.com/streadway/amqp)
-
-%description unit-test-devel
-%{summary}
+%description
+%{common_description}
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%gopkg
%prep
-%setup -q -n %{repo}-%{version}
+%goprep
-%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
+%gopkginstall
+%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}
+# .: needs network
+%gocheck -d .
%endif
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md ChangeLog.md CONTRIBUTING.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 ChangeLog.md CONTRIBUTING.md
-%endif
+%gopkgfiles
%changelog
+* Sat Jun 01 23:05:42 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 2.0.0-1.rc.2
+- Release 2.0.0-rc.2
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index b4e3190..825a07b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rabbit-hole-1.4.0.tar.gz) = ab39dfea1e023346462c9f644b1fd34262b46a2955f3898154c9dbf7348682c992b204dc7a734dd6a4c7000d5bbda40a5764795dfaeba1d9c59e6846cd7f6042
+SHA512 (rabbit-hole-2.0.0-rc.2.tar.gz) = 07973aadb6363288499a0581d22e7bde1374b9cd00f5daac5baa6f4e57fff486f77e270539ab6fa620ea410239707027a3383cc118d6c9f24d687746acb336ce
4 years, 10 months
Architecture specific change in rpms/golang-github-samalba-dockerclient.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-samalba-dockerclient.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-samalba-dockerclien....
Change:
-ExcludeArch: ppc64
Thanks.
Full change:
============
commit c13df1899db0dac5888a208ca13d927a069f60f1
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Sat Jun 1 22:03:32 2019 +0200
Bump to commit a3036261847103270e9f732509f43b5f98710ace
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 8bebe29..14308ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/dockerclient-c37a52f55ab5a9edb9ffd4cf6e78692962b29b8d.tar.gz
+/dockerclient-a3036261847103270e9f732509f43b5f98710ace.tar.gz
diff --git a/golang-github-samalba-dockerclient.spec b/golang-github-samalba-dockerclient.spec
index 3831e13..8796e09 100644
--- a/golang-github-samalba-dockerclient.spec
+++ b/golang-github-samalba-dockerclient.spec
@@ -1,65 +1,85 @@
-# http://github.com/samalba/dockerclient
+# Generated by go2rpm
+%bcond_without check
+
+# https://github.com/samalba/dockerclient
%global goipath github.com/samalba/dockerclient
-%global commit c37a52f55ab5a9edb9ffd4cf6e78692962b29b8d
+%global commit a3036261847103270e9f732509f43b5f98710ace
+
+%gometa
+
+%global common_description %{expand:
+Docker client library in Go.}
+%global golicenses LICENSE
+%global godocs examples README.md
-%gometa -i
+%global gosupfiles glide.lock glide.yaml
Name: %{goname}
Version: 0
-Release: 0.13%{?dist}
-Summary: Docker client library in Go http://www.docker.com/
+Release: 0.14%{?dist}
+Summary: Docker client library in Go
+
+# Upstream license specification: Apache-2.0
License: ASL 2.0
URL: %{gourl}
Source0: %{gosource}
Source1: glide.yaml
-Source2: glide.yaml
-
-ExcludeArch: ppc64
+Source2: glide.lock
-%description
-%{summary}
+BuildRequires: golang(github.com/docker/go-units)
+BuildRequires: golang(github.com/stretchr/testify/mock)
-%package devel
-Summary: %{summary}
+%if %{with check}
+# Tests
+BuildRequires: golang(github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog)
+BuildRequires: golang(github.com/docker/docker/pkg/ioutils)
+BuildRequires: golang(github.com/docker/docker/pkg/stdcopy)
+BuildRequires: golang(github.com/gorilla/mux)
+%endif
-BuildRequires: golang(github.com/docker/docker/pkg/jsonlog)
-BuildRequires: golang(github.com/docker/docker/pkg/stdcopy)
-BuildRequires: golang(github.com/docker/docker/utils)
-BuildRequires: golang(github.com/gorilla/mux)
-BuildRequires: golang(github.com/stretchr/testify/mock)
-
-%description devel
-%{summary}
+%description
+%{common_description}
-This package contains library source intended for
-building other packages which use %{goipath}.
+%gopkg
%prep
-%forgesetup
-cp %{SOURCE1} %{SOURCE2} .
-%install
-%goinstall glide.lock glide.yaml
+%goprep
+find . -name "*.go" -exec sed -i "s|github.com/docker/docker/pkg/jsonlog|github.com/docker/docker/daemon/lo..." "{}" +;
+cp %{S:1} %{S:2} .
+%install
+%gopkginstall
+
+# Remove in F33
+# Remove erroneous glide.lock folder
+%pretrans devel -p <lua>
+path = "%{gopath}/src/%{goipath}/glide.lock"
+st = posix.stat(path)
+if st and st.type == "directory" then
+ os.remove(path)
+end
+
+%if %{with check}
%check
-# looks like this needs docker running
-#.
-GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{goipath}/mockclient
+# https://github.com/samalba/dockerclient/issues/244
+%gocheck -d .
+%endif
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md
+%gopkgfiles
%changelog
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - Forge-specific packaging variables
+* Sat Jun 01 20:49:22 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0-0.14.20190601gita303626
+- Bump to commit a3036261847103270e9f732509f43b5f98710ace
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.13.gitc37a52f
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-* Tue Oct 23 2018 Nicolas Mailhot <nim(a)fedoraproject.org>
-- 0-0.12
+* Tue Oct 23 2018 Nicolas Mailhot <nim(a)fedoraproject.org> - 0-0.12.gitc37a52f
- redhat-rpm-config-123 triggers bugs in gosetup, remove it from Go spec files as its just an alias
- https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - Forge-specific packaging variables
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.11.gitc37a52f
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Jul 02 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.10.gitc37a52f
diff --git a/sources b/sources
index 5f3cf9a..612355a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dockerclient-c37a52f55ab5a9edb9ffd4cf6e78692962b29b8d.tar.gz) = a6fd34e978fd2c61a4a1d5cc042f1de25d0b18751941be86c3f1ce73c9fb65675d0bc1967acce563664d31d25bf0878263f85b0ffd8a4b2495ec947351b8d0c7
+SHA512 (dockerclient-a3036261847103270e9f732509f43b5f98710ace.tar.gz) = 14325e0d05617eef1832a4c5b545ce01a0dd91bd879caa8c1ea03145bd5c4f0bd6108a7c01b3edc39173f7e8a2d017e807129a4a8ce6dede7e55198485394225
4 years, 10 months
Architecture specific change in rpms/golang-github-mgutz-logxi.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-mgutz-logxi.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-mgutz-logxi.git/com....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 7632ff3650891f40e8c600f73437db7631befb26
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Sat Jun 1 00:09:54 2019 +0200
Update to new macros
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/golang-github-mgutz-logxi.spec b/golang-github-mgutz-logxi.spec
index 13abc62..07caa96 100644
--- a/golang-github-mgutz-logxi.spec
+++ b/golang-github-mgutz-logxi.spec
@@ -1,196 +1,60 @@
-# 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
+# Generated by go2rpm
# tests are broken except when run in very specific ways
-%global with_check 0
-# Generate unit-test rpm
-%global with_unit_test 0
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
+%bcond_with check
-%global provider github
-%global provider_tld com
-%global project mgutz
-%global repo logxi
# https://github.com/mgutz/logxi
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 1
-Release: 4%{?dist}
-Summary: A 12-factor app logger built for performance and happy development
-# Detected licences
-# - MIT/X11 (BSD like) at 'LICENSE'
-License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/v%{version}/%{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 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 goipath github.com/mgutz/logxi
+Version: 1
+%gometa
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(github.com/mattn/go-colorable)
-BuildRequires: golang(github.com/mattn/go-isatty)
-BuildRequires: golang(github.com/mgutz/ansi)
-%endif
+%global common_description %{expand:
+Log XI is a structured 12-factor app logger built for speed and happy
+development.}
-Requires: golang(github.com/mattn/go-colorable)
-Requires: golang(github.com/mattn/go-isatty)
-Requires: golang(github.com/mgutz/ansi)
+%global golicenses LICENSE
+%global godocs README.md
-Provides: golang(%{import_path}/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/v1/cmd/reldir) = %{version}-%{release}
+Name: %{goname}
+Release: 5%{?dist}
+Summary: 12-factor app logger built for performance and happy development
-%description devel
-%{summary}
-
-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
+License: MIT
+URL: %{gourl}
+Source0: %{gosource}
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
+BuildRequires: golang(github.com/mattn/go-colorable)
+BuildRequires: golang(github.com/mattn/go-isatty)
+BuildRequires: golang(github.com/mgutz/ansi)
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(github.com/Sirupsen/logrus)
-BuildRequires: golang(github.com/stretchr/testify/assert)
+%if %{with check}
+# Tests
+BuildRequires: golang(github.com/stretchr/testify/assert)
%endif
-Requires: golang(github.com/Sirupsen/logrus)
-Requires: golang(github.com/stretchr/testify/assert)
-
-%description unit-test-devel
-%{summary}
+%description
+%{common_description}
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%gopkg
%prep
-%setup -q -n %{repo}-%{version}
+%goprep
+rm -rf Gododir
-%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
+%gopkginstall
+%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
+%gocheck
%endif
-%gotest %{import_path}/v1
-%gotest %{import_path}/v1/bench
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-
-%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
+%gopkgfiles
%changelog
+* Fri May 31 23:48:10 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 1-5
+- Update to new macros
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
4 years, 10 months
Architecture specific change in rpms/golang-github-spf13-fsync.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-spf13-fsync.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-spf13-fsync.git/com....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 97b1d35aa10133a9584a4996ca63ebdfe37d8058
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Fri May 31 22:49:09 2019 +0200
Update to new macros
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 8c9b5b8..c7bfa53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/fsync-cb2da33.tar.gz
/fsync-12a01e6.tar.gz
+/fsync-12a01e648f05a938100a26858d2d59a120307a18.tar.gz
diff --git a/golang-github-spf13-fsync.spec b/golang-github-spf13-fsync.spec
index f385bc9..c457c66 100644
--- a/golang-github-spf13-fsync.spec
+++ b/golang-github-spf13-fsync.spec
@@ -1,170 +1,51 @@
-# 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 spf13
-%global repo fsync
# https://github.com/spf13/fsync
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%global goipath github.com/spf13/fsync
%global commit 12a01e648f05a938100a26858d2d59a120307a18
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.7.git%{shortcommit}%{?dist}
-Summary: Keeps files or directories in sync
-License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.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 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}
-
-
-%description
-%{summary}.
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
+%gometa
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(github.com/spf13/afero)
-%endif
-
-Requires: golang(github.com/spf13/afero)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
-%description devel
-%{summary}.
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
+%global common_description %{expand:
+Package Fsync keeps files and directories in sync.}
-%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
+%global golicenses LICENSE
+%global godocs README.md
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
+Name: %{goname}
+Version: 0
+Release: 0.8%{?dist}
+Summary: Keeps files or directories in sync
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
+License: MIT
+URL: %{gourl}
+Source0: %{gosource}
+BuildRequires: golang(github.com/spf13/afero)
-%description unit-test-devel
-%{summary}.
+%description
+%{common_description}
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%gopkg
%prep
-%setup -q -n %{repo}-%{commit}
+%goprep
-%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
+%gopkginstall
+%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
-%endif
-
-%gotest %{import_path}
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
+%gocheck
%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
+%gopkgfiles
%changelog
+* Fri May 31 22:35:05 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0-0.8.20190531git12a01e6
+- Update to new macros
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.7.git12a01e6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
@@ -185,4 +66,3 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
* Sun Feb 26 2017 Frederico Lima <fredlima(a)fedoraproject.org> - 0-0.1.gitcb2da33
- First package for Fedora
-
diff --git a/sources b/sources
index 16cd84c..9745bbe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fsync-12a01e6.tar.gz) = 62c62aa2090ca0dd4aa24b4ba452a8635d5d6ee89740ab34178fb1b7665de515e65dd38504498156f183c0362953ea3ae8aa6ab1c6385f8bdc1c38e6e258448e
+SHA512 (fsync-12a01e648f05a938100a26858d2d59a120307a18.tar.gz) = 62c62aa2090ca0dd4aa24b4ba452a8635d5d6ee89740ab34178fb1b7665de515e65dd38504498156f183c0362953ea3ae8aa6ab1c6385f8bdc1c38e6e258448e
4 years, 10 months