[gnuradio/f16] Fixed double packaging of doc Resolves: rhbz#769069 Fixed rpmlint warnings
Jaroslav Škarvada
jskarvad at fedoraproject.org
Wed Dec 21 15:18:24 UTC 2011
commit 280fc8b550c3c73690fb218e8c787b02f938e4f4
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Wed Dec 21 16:13:38 2011 +0100
Fixed double packaging of doc
Resolves: rhbz#769069
Fixed rpmlint warnings
gnuradio.spec | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/gnuradio.spec b/gnuradio.spec
index 8c4ddbf..cadba8c 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -2,25 +2,25 @@
%{?_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 279
Name: gnuradio
Version: 3.4.2
-Release: 3%{?dist}
+Release: 4%{?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: ftp://ftp.gnu.org/gnu/gnuradio/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)
Source1: 10-usrp.rules
# fixed compilation with sdcc3
@@ -66,9 +66,9 @@ Requires: scipy
Requires: portaudio
Requires: python-lxml
Requires: pygtk2
-Requires: python-cheetah
+Requires: python-cheetah
Provides: usrp = %{version}-%{release}
-Obsoletes: usrp < 3.3.0-1
+Obsoletes: usrp < 3.3.0-1
Obsoletes: grc < 0.80-1
%description
@@ -159,7 +159,9 @@ getent group usrp >/dev/null || groupadd -r usrp
%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,-)
@@ -170,13 +172,19 @@ getent group usrp >/dev/null || groupadd -r usrp
%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
+* Wed Dec 21 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.4.2-4
+- Fixed double packaging of doc
+ Resolves: rhbz#769069
+- Fixed rpmlint warnings
+
* Mon Dec 12 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.4.2-3
- Rebuilt with uhd support
More information about the scm-commits
mailing list