New version

Disabled tests
  Resolves: rhbz#1736932
This commit is contained in:
Jaroslav Škarvada 2019-08-03 13:31:33 +02:00
parent 556c7d8985
commit ef6944b8f3
2 changed files with 18 additions and 12 deletions

View File

@ -1,2 +1,2 @@
SHA512 (uhd-3.14.0.0-c52f3f41.tar.gz) = 48070a454ea88414a5f323e6e52d199a46f61d43b3b68ca8e26cdd204666beba5b65978736719d14cffd845c00b1fa5bd014cd229cc30729119c511fb9e3ed54
SHA512 (uhd-images_3.14.0.0.tar.xz) = a173d8c384dbe4936b5cfb580c572ca94b877c07ce578960cb9dab30e8d3ee9bfc1833c13981828bb31a748bb0db3e7e1ab475620596ad62d1570703ac0a163b
SHA512 (uhd-images_3.14.1.0.tar.xz) = 42bd97fbabfbd2195d9bbe3f339666eb3aadc075bf650817071f8c1c97fd116cace1960fd523cfb3f409dbd5afb7b062a876ff7b03ecb9684645e5d5b98ade54
SHA512 (uhd-3.14.1.0.tar.gz) = afb58b2f75b9855a4252c21c40e0f8816626910a134719321fa98ec78ce13aa32577a959da11d13d1e40dc61f143442ab7c2993edec111267de4664730c6eb82

View File

@ -1,8 +1,8 @@
%global git_commit c52f3f41806622c95573de21be042f966f675543
%global git_date 201904023
#%%global git_commit c52f3f41806622c95573de21be042f966f675543
#%%global git_date 201904023
%global git_short_commit %(echo %{git_commit} | cut -c -8)
%global git_suffix %{git_date}git%{git_short_commit}
#%%global git_short_commit %%(echo %{git_commit} | cut -c -8)
#%%global git_suffix %%{git_date}git%{git_short_commit}
# By default include binary_firmware, otherwise try to rebuild
# the firmware from sources. If you want to rebuild all firmware
@ -28,8 +28,8 @@
Name: uhd
URL: http://github.com/EttusResearch/uhd
Version: 3.14.0.0
Release: 3.%{git_suffix}%{?dist}
Version: 3.14.1.0
Release: 1%{?dist}
License: GPLv3+
BuildRequires: gcc-c++
BuildRequires: cmake
@ -47,7 +47,7 @@ Requires(pre): shadow-utils, glibc-common
Requires: python2-tkinter
Summary: Universal Hardware Driver for Ettus Research products
#Source0: %%{url}/archive/v%%{version}/uhd-%%{version}.tar.gz
Source0: %{url}/archive/%{git_commit}/uhd-%{version}-%{git_short_commit}.tar.gz
Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz
Source1: %{name}-limits.conf
Source2: %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz
@ -96,7 +96,7 @@ Wireshark dissector plugins.
%endif
%prep
%setup -q -n %{name}-%{git_commit}
%setup -q
# firmware
%if %{with binary_firmware}
@ -125,9 +125,10 @@ popd
mkdir -p host/build
pushd host/build
%cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python2}" \
-DUHD_VERSION="%{version}" ../
# -DENABLE_TESTS=off ../
-DUHD_VERSION="%{version}" \
-DENABLE_TESTS=off ../
make %{?_smp_mflags}
#make -j1
popd
# tools
@ -256,6 +257,11 @@ exit 0
%endif
%changelog
* Fri Aug 2 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 3.14.1.0-1
- New version
- Disabled tests
Resolves: rhbz#1736932
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.0.0-3.201904023gitc52f3f41
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild