New git snapshot
Added python2-numpy build requirement Re-enabled tests for upstream to easily reproduce the problem
This commit is contained in:
parent
2a6210da45
commit
35e76b3bd9
2
sources
2
sources
|
@ -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.0.0.tar.xz) = a173d8c384dbe4936b5cfb580c572ca94b877c07ce578960cb9dab30e8d3ee9bfc1833c13981828bb31a748bb0db3e7e1ab475620596ad62d1570703ac0a163b
|
||||||
SHA512 (uhd-3.14.0.0-ac96d055.tar.gz) = 2a913ad0f78563fc0d47a74022e87d15004f14f4290313ec221ac96e729438e772b4b6d359e6d94f286ff935324863a2423c0eed409d36825c620f69d2c0e840
|
|
||||||
|
|
15
uhd.spec
15
uhd.spec
|
@ -1,5 +1,5 @@
|
||||||
%global git_commit ac96d055091c29e2c6b08762b3b3d9da8db5b855
|
%global git_commit c52f3f41806622c95573de21be042f966f675543
|
||||||
%global git_date 20190401
|
%global git_date 201904023
|
||||||
|
|
||||||
%global git_short_commit %(echo %{git_commit} | cut -c -8)
|
%global git_short_commit %(echo %{git_commit} | cut -c -8)
|
||||||
%global git_suffix %{git_date}git%{git_short_commit}
|
%global git_suffix %{git_date}git%{git_short_commit}
|
||||||
|
@ -29,12 +29,13 @@
|
||||||
Name: uhd
|
Name: uhd
|
||||||
URL: http://github.com/EttusResearch/uhd
|
URL: http://github.com/EttusResearch/uhd
|
||||||
Version: 3.14.0.0
|
Version: 3.14.0.0
|
||||||
Release: 1.%{git_suffix}%{?dist}
|
Release: 2.%{git_suffix}%{?dist}
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: boost-devel, libusb1-devel, python2-cheetah, ncurses-devel
|
BuildRequires: boost-devel, libusb1-devel, python2-cheetah, ncurses-devel
|
||||||
BuildRequires: python2-docutils, doxygen, pkgconfig, libpcap-devel
|
BuildRequires: python2-docutils, doxygen, pkgconfig, libpcap-devel
|
||||||
|
BuildRequires: python2-numpy
|
||||||
%if %{with wireshark}
|
%if %{with wireshark}
|
||||||
BuildRequires: wireshark-devel
|
BuildRequires: wireshark-devel
|
||||||
%endif
|
%endif
|
||||||
|
@ -124,7 +125,8 @@ popd
|
||||||
mkdir -p host/build
|
mkdir -p host/build
|
||||||
pushd host/build
|
pushd host/build
|
||||||
%cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python2}" \
|
%cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python2}" \
|
||||||
-DUHD_VERSION="%{version}" -DENABLE_TESTS=off ../
|
-DUHD_VERSION="%{version}" ../
|
||||||
|
# -DENABLE_TESTS=off ../
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
@ -254,6 +256,11 @@ exit 0
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Apr 23 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 3.14.0.0-2.201904023gitc52f3f41
|
||||||
|
- New git snapshot
|
||||||
|
- Added python2-numpy build requirement
|
||||||
|
- Re-enabled tests for upstream to easily reproduce the problem
|
||||||
|
|
||||||
* Mon Apr 15 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 3.14.0.0-1.20190401gitac96d055
|
* Mon Apr 15 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 3.14.0.0-1.20190401gitac96d055
|
||||||
- New version, switched to git snapshot
|
- New version, switched to git snapshot
|
||||||
- Conditionalized wireshark support
|
- Conditionalized wireshark support
|
||||||
|
|
Loading…
Reference in New Issue