[gnuradio] Fixed double packaging of doc Resolves: rhbz#769069 Fixed rpmlint warnings

[Jaroslav Škarvada]

commit 9d363ebd7efb28df4966aa0565ecdac57e7f3f76
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Wed Dec 21 15:39:24 2011 +0100

    Fixed double packaging of doc
    Resolves: rhbz#769069
    Fixed rpmlint warnings

 gnuradio.spec |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/gnuradio.spec b/gnuradio.spec
index 2fa8eba..46892a7 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -2,26 +2,26 @@
 %{?_smp_mflags: %global my_smp_mflags %(echo "%{_smp_mflags}" | sed 's/-j[0-9]\\+/-j1/g')}
 
 # For versions not yet on ftp, pull from git
-#%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a
+#%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a
 
 # For versions published as attachment (strange)
 %global attachment_id 288
 
 Name:		gnuradio
 Version:	3.5.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
 License:	GPLv3
 URL:		http://www.gnuradio.org
-#Source0:	ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%{version}.tar.gz
-#Source0:	http://gnuradio.org/redmine/attachments/download/%{attachment_id}/gnuradio-%{version}.tar.gz
+#Source0:	ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%%{version}.tar.gz
+#Source0:	http://gnuradio.org/redmine/attachments/download/%%{attachment_id}/gnuradio-%%{version}.tar.gz
 Source0:	http://gnuradio.org/redmine/attachments/download/%{attachment_id}/gnuradio-%{version}.tar.gz
 # git clone git://gnuradio.org/gnuradio
 # cd gnuradio
-# git archive --format=tar --prefix=%{name}-%{version}/ %{git_commit} | \
-# gzip > ../%{name}-%{version}.tar.gz
+# git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \
+# gzip > ../%%{name}-%%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre):	shadow-utils
@@ -62,8 +62,8 @@ Requires:	scipy
 Requires:	portaudio
 Requires:	python-lxml
 Requires:	pygtk2
-Requires:       python-cheetah
-Obsoletes:	usrp <  3.3.0-1
+Requires:	python-cheetah
+Obsoletes:	usrp < 3.3.0-1
 Obsoletes:	grc < 0.80-1
 
 %description
@@ -143,7 +143,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/gnuradio/conf.d/*.conf
 %exclude %{_datadir}/gnuradio/examples
 %exclude %{python_sitearch}/gnuradio/*.la
-%doc ChangeLog README README.hacking NEWS INSTALL COPYING AUTHORS
+%exclude %{_docdir}/%{name}-%{version}/html
+%exclude %{_docdir}/%{name}-%{version}/xml
+%doc ChangeLog NEWS INSTALL COPYING AUTHORS
 
 %files devel
 %defattr(-,root,root,-)
@@ -154,13 +156,19 @@ rm -rf %{buildroot}
 
 %files doc
 %defattr(-,root,root,-)
-%doc %{_docdir}/*
+%doc %{_docdir}/%{name}-%{version}/html
+%doc %{_docdir}/%{name}-%{version}/xml
 
 %files examples
 %defattr(-,root,root,-)
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Tue Dec 20 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.5.0-2
+- Fixed double packaging of doc
+  Resolves: rhbz#769069
+- Fixed rpmlint warnings
+
 * Tue Dec 13 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.5.0-1
 - New version
 - Used macros instead of variables in spec