[uhd] New version

[Jaroslav Škarvada]

commit 495fa3c88337c6b3dd06b2159bcde3a7fa75629a
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Tue Feb 11 14:24:28 2014 +0100

    New version
    
      Resolves: rhbz#1063587

 sources  |    4 +-
 uhd.spec |   82 +++++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 49 insertions(+), 37 deletions(-)
---
diff --git a/sources b/sources
index 2c5ae29..6233b1f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-65cf76fd363d576ceff9c1527ade297b  uhd-images_003.005.003-release.tar.gz
-99984db89c8fcf1db3aa1e5284fac1e7  uhd-release_003_005_003.tar.gz
+81be16f9195c553f55fc1f5fc0daaddb  uhd-images_003.006.002-release.tar.gz
+50a25b95dc08dd3946988c5da98814a9  uhd-release_003_006_002.tar.gz
diff --git a/uhd.spec b/uhd.spec
index fb18ca9..0804031 100644
--- a/uhd.spec
+++ b/uhd.spec
@@ -4,8 +4,8 @@
 %bcond_without binary_firmware
 
 %global ver_major 3
-%global ver_minor 5
-%global ver_patch 3
+%global ver_minor 6
+%global ver_patch 2
 
 %global ver %(printf "%03d.%03d.%03d" %{ver_major} %{ver_minor} %{ver_patch})
 %global ver_ %(printf "%03d_%03d_%03d" %{ver_major} %{ver_minor} %{ver_patch})
@@ -13,7 +13,7 @@
 Name:           uhd
 URL:            http://code.ettus.com/redmine/ettus/projects/uhd/wiki
 Version:        %{ver_major}.%{ver_minor}.%{ver_patch}
-Release:        3%{?dist}
+Release:        1%{?dist}
 License:        GPLv3+
 BuildRequires:  cmake
 BuildRequires:  boost-devel libusb1-devel python-cheetah
@@ -38,6 +38,31 @@ The UHD is the universal hardware driver for Ettus Research products.
 The goal of the UHD is to provide a host driver and API for current and
 future Ettus Research products. It can be used standalone without GNU Radio.
 
+%package firmware
+Summary:        Firmware files for UHD
+Group:          Applications/Engineering
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
+
+%description firmware
+Firmware files for the Universal Hardware driver (UHD).
+
+%package devel
+Summary:        Development files for UHD
+Group:          Applications/Engineering
+Requires:       %{name} = %{version}-%{release}
+
+%description devel
+Development files for the Universal Hardware Driver (UHD).
+
+%package doc
+Summary:        Documentation files for UHD
+Group:          Applications/Engineering
+BuildArch:      noarch
+
+%description doc
+Documentation for the Universal Hardware Driver (UHD).
+
 %prep
 %setup -q -n uhd-release_%{ver_}
 %patch0 -p1 -b .no-neon
@@ -77,21 +102,21 @@ pushd host/build
 make install DESTDIR=%{buildroot}
 
 # Fix udev rules and allow access only to users in usrp group
-sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/GROUP:="usrp", MODE:="0660"/' %{buildroot}%{_datadir}/uhd/utils/uhd-usrp.rules
+sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/GROUP:="usrp", MODE:="0660"/' %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules
 mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d
-mv %{buildroot}%{_datadir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules
+mv %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules
 
-# Remove binaries for tests, examples
-rm -rf %{buildroot}%{_datadir}/uhd/{tests,examples}
+# Remove tests, examples binaries
+rm -rf %{buildroot}%{_libdir}/uhd/{tests,examples}
 
 # Move the utils stuff to libexec dir
 mkdir -p %{buildroot}%{_libexecdir}/uhd
-mv %{buildroot}%{_datadir}/uhd/utils/* %{buildroot}%{_libexecdir}/uhd
+mv %{buildroot}%{_libdir}/uhd/utils/* %{buildroot}%{_libexecdir}/uhd
 
 popd
 # Package base docs to base package
 mkdir _tmpdoc
-mv %{buildroot}%{_docdir}/%{name}/{AUTHORS.txt,LICENSE.txt,README.txt} _tmpdoc
+mv %{buildroot}%{_docdir}/%{name}/{LICENSE,README.md} _tmpdoc
 
 install -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/security/limits.d/99-usrp.conf
 
@@ -99,6 +124,9 @@ install -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/security/limits.d/99-usr
 mkdir -p %{buildroot}%{_datadir}/uhd/images
 cp -r images/images/* %{buildroot}%{_datadir}/uhd/images
 
+# remove win stuff
+rm -rf %{buildroot}%{_datadir}/uhd/images/winusb_driver
+
 # convert hardlinks to symlinks (to not package the file twice)
 pushd %{buildroot}%{_bindir}
 unlink ./usrp_n2xx_simple_net_burner
@@ -109,35 +137,13 @@ popd
 
 %postun -p /sbin/ldconfig
 
-%package firmware
-Summary:        Firmware files for UHD
-Group:          Applications/Engineering
-Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
-
-%description firmware
-Firmware files for the Universal Hardware driver (UHD).
-
-%package devel
-Summary:        Development files for UHD
-Group:          Applications/Engineering
-Requires:       %{name} = %{version}-%{release}
-
-%description devel
-Development files for the Universal Hardware Driver (UHD).
-
-%package doc
-Summary:        Documentation files for UHD
-Group:          Applications/Engineering
-BuildArch:      noarch
-
-%description doc
-Documentation for the Universal Hardware Driver (UHD).
-
 %pre
 getent group usrp >/dev/null || groupadd -r usrp >/dev/null
 
 %files
+%exclude %{_docdir}/%{name}/manual
+%exclude %{_docdir}/%{name}/doxygen
+%exclude %{_datadir}/uhd/images
 %doc _tmpdoc/*
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules
@@ -145,6 +151,7 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null
 %{_libdir}/lib*.so.*
 %{_libexecdir}/uhd
 %{_mandir}/man1/*.1*
+%{_datadir}/uhd
 
 %files firmware
 %dir %{_datadir}/uhd/images
@@ -156,9 +163,14 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null
 %{_libdir}/pkgconfig/*.pc
 
 %files doc
-%doc %{_docdir}/%{name}/*
+%doc %{_docdir}/%{name}/manual
+%doc %{_docdir}/%{name}/doxygen
 
 %changelog
+* Tue Feb 11 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 3.6.2-1
+- New version
+  Resolves: rhbz#1063587
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild