[gnuradio/f16] Used macros instead of variables in spec usrp docs moved to gnuradio dir

[Jaroslav Škarvada]

commit ad57cbde89bef6ca57369cdd57169d926371f443
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Fri Dec 23 23:25:32 2011 +0100

    Used macros instead of variables in spec
    usrp docs moved to gnuradio dir

 gnuradio.spec |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/gnuradio.spec b/gnuradio.spec
index cadba8c..9832cf0 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -9,7 +9,7 @@
 
 Name:		gnuradio
 Version:	3.4.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -131,16 +131,19 @@ export PATH=%{_libexecdir}/sdcc:$PATH
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 # make with -j1 and compile without strict-aliasing
-make %{?my_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+make %{?my_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing"
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 export PATH=%{_libexecdir}/sdcc:$PATH
-make install DESTDIR=$RPM_BUILD_ROOT
-install -D -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-usrp.rules
+make install DESTDIR=%{buildroot}
+install -D -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/udev/rules.d/10-usrp.rules
+
+# move usrp docs to gnuradio dir
+mv %{buildroot}%{_docdir}/usrp-%{version} %{buildroot}%{_docdir}/%{name}-%{version}/usrp
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -n gnuradio -p /sbin/ldconfig
 %postun -n gnuradio -p /sbin/ldconfig
@@ -161,6 +164,7 @@ getent group usrp >/dev/null || groupadd -r usrp
 %exclude %{python_sitearch}/gnuradio/*.la
 %exclude %{_docdir}/%{name}-%{version}/html
 %exclude %{_docdir}/%{name}-%{version}/xml
+%exclude %{_docdir}/%{name}-%{version}/usrp/html
 %doc ChangeLog NEWS INSTALL COPYING AUTHORS
 
 %files devel
@@ -174,12 +178,17 @@ getent group usrp >/dev/null || groupadd -r usrp
 %defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}/html
 %doc %{_docdir}/%{name}-%{version}/xml
+%doc %{_docdir}/%{name}-%{version}/usrp/html
 
 %files examples
 %defattr(-,root,root,-)
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Fri Dec 23 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.4.2-5
+- Used macros instead of variables in spec
+- usrp docs moved to gnuradio dir
+
 * Wed Dec 21 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.4.2-4
 - Fixed double packaging of doc
   Resolves: rhbz#769069