jskarvad pushed to gnuradio (f22). "New version (..more)"

[notifications at fedoraproject.org]

From 4e8b6d39486cd86ddba665b511f1bcb79488b375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad at redhat.com>
Date: Fri, 15 May 2015 22:12:30 +0200
Subject: New version

  Resolves: rhbz#1220588
- Rebased size_t patch
- Dropped volk-memalign-fix patch (not needed)
- Dropped wxpython3-gtk3 patch (upstreamed)
- Set DOCDIR to match Fedora documentation location (by docdir-override patch)

diff --git a/gnuradio-3.7.7.1-docdir-override.patch b/gnuradio-3.7.7.1-docdir-override.patch
new file mode 100644
index 0000000..7804548
--- /dev/null
+++ b/gnuradio-3.7.7.1-docdir-override.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 271e93c..f5b3094 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -149,7 +149,9 @@ set(GR_INCLUDE_DIR      include)
+ set(GR_DATA_DIR         share)
+ set(GR_PKG_DATA_DIR     ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
+ set(GR_DOC_DIR          ${GR_DATA_DIR}/doc)
+-set(GR_PKG_DOC_DIR      ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}-${DOCVER})
++if (NOT GR_PKG_DOC_DIR)
++  set(GR_PKG_DOC_DIR      ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}-${DOCVER})
++endif()
+ set(GR_CONF_DIR         etc)
+ set(GR_PKG_CONF_DIR     ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d)
+ set(GR_LIBEXEC_DIR      libexec)
diff --git a/gnuradio.spec b/gnuradio.spec
index bbbaf10..058faf5 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -58,6 +58,9 @@ Obsoletes:	grc < 0.80-1
 # rhbz#1143914, patch approved by upstream to be used as distro specific
 # patch, upstream report: http://gnuradio.org/redmine/issues/728
 Patch0:	gnuradio-3.7.7.1-size_t.patch
+# patch sent upstream, upstream report:
+# http://gnuradio.org/redmine/issues/791
+Patch1:	gnuradio-3.7.7.1-docdir-override.patch
 
 %description
 GNU Radio is a collection of software that when combined with minimal
@@ -96,6 +99,7 @@ GNU Radio examples
 %prep
 %setup -q
 %patch0 -p1 -b .size_t
+%patch1 -p1 -b .docdir-override
 
 #force regeneration of cached moc output files
 find . -name "*_moc.cc" -exec rm {} \;
@@ -118,6 +122,7 @@ cd build
 -DENABLE_GRC=FORCE -DENABLE-GR_COMEDI=FORCE \
 -DENABLE_GR_FCD=FORCE \
 -DSYSCONFDIR=%{_sysconfdir} \
+-DGR_PKG_DOC_DIR=%{_docdir}/%{name} \
 %{?mfpu_neon} \
 ..
 
@@ -133,10 +138,6 @@ pushd build
 make install DESTDIR=%{buildroot}
 popd
 
-# install some more docs
-mv %{buildroot}%{_docdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name}
-install -m 644 -t %{buildroot}%{_docdir}/%{name} COPYING
-
 # remove atsc example (bytecompilation problem)
 # the examples shouldn't be probably bytecompiled,
 # but selective bytecompilation would take a lot of time,
@@ -154,6 +155,7 @@ rm -rf %{buildroot}
 %postun -n gnuradio -p /sbin/ldconfig
 
 %files
+%license COPYING
 %defattr(-,root,root,-)
 %{python_sitearch}/*
 %{_bindir}/*
@@ -190,6 +192,7 @@ rm -rf %{buildroot}
 - Rebased size_t patch
 - Dropped volk-memalign-fix patch (not needed)
 - Dropped wxpython3-gtk3 patch (upstreamed)
+- Set DOCDIR to match Fedora documentation location (by docdir-override patch)
 
 * Sun May 03 2015 Kalev Lember <kalevlember at gmail.com> - 3.7.6.1-4
 - Rebuilt for GCC 5 C++11 ABI change
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gnuradio.git/commit/?h=f22&id=4e8b6d39486cd86ddba665b511f1bcb79488b375