[gr-osmosdr] Initial import (#948000)

Jaroslav Škarvada jskarvad at fedoraproject.org
Wed Apr 10 13:44:31 UTC 2013


commit f3db9f428f8d27a922c09f090d59b337f8bdb7fb
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Wed Apr 10 15:44:12 2013 +0200

    Initial import (#948000)

 .gitignore                             |    1 +
 gr-osmosdr-0.0.1-docdir-override.patch |   15 +++++
 gr-osmosdr-0.0.1-doxygen-fix.patch     |   28 ++++++++
 gr-osmosdr.spec                        |  107 ++++++++++++++++++++++++++++++++
 sources                                |    1 +
 5 files changed, 152 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..74eb0ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+gr-osmosdr-*.tar.bz2
diff --git a/gr-osmosdr-0.0.1-docdir-override.patch b/gr-osmosdr-0.0.1-docdir-override.patch
new file mode 100644
index 0000000..b98625c
--- /dev/null
+++ b/gr-osmosdr-0.0.1-docdir-override.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a1af563..9ff0b37 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -97,7 +97,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})
++if (NOT GR_PKG_DOC_DIR)
++    set(GR_PKG_DOC_DIR      ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME})
++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/gr-osmosdr-0.0.1-doxygen-fix.patch b/gr-osmosdr-0.0.1-doxygen-fix.patch
new file mode 100644
index 0000000..4e8a8ca
--- /dev/null
+++ b/gr-osmosdr-0.0.1-doxygen-fix.patch
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a9334c8..a1af563 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -116,6 +116,7 @@ find_package(GnuradioFCD)
+ find_package(LibOsmoSDR)
+ find_package(LibRTLSDR)
+ find_package(LibMiriSDR)
++find_package(Doxygen)
+ 
+ if(NOT GRUEL_FOUND)
+     message(FATAL_ERROR "Gruel required to compile osmosdr")
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index f16fbf6..446b86a 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -18,11 +18,6 @@
+ # Boston, MA 02110-1301, USA.
+ 
+ ########################################################################
+-# Setup dependencies
+-########################################################################
+-find_package(Doxygen)
+-
+-########################################################################
+ # Begin conditional configuration
+ ########################################################################
+ if(ENABLE_DOXYGEN)
diff --git a/gr-osmosdr.spec b/gr-osmosdr.spec
new file mode 100644
index 0000000..ef92982
--- /dev/null
+++ b/gr-osmosdr.spec
@@ -0,0 +1,107 @@
+%global git_commit e85c68d9f84f955cbe9f3d4c730561580f6cfcf9
+%global git_date 20130403
+
+%global git_short_commit %(echo %{git_commit} | cut -c -8)
+%global git_suffix %{git_date}git%{git_short_commit}
+
+# git clone git://git.osmocom.org/gr-osmosdr
+# cd %%{name}
+# git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \
+# bzip2 > ../%%{name}-%%{version}-%%{git_suffix}.tar.bz2
+
+%{?filter_setup:
+%filter_provides_in %{python_sitearch}/osmosdr/.*\.so$
+%filter_setup
+}
+
+Name:             gr-osmosdr
+URL:              http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
+Version:          0.0.1
+Release:          2.%{git_suffix}%{?dist}
+License:          GPLv3+
+BuildRequires:    cmake, python2-devel, gnuradio-devel, boost-devel, doxygen
+BuildRequires:    graphviz, swig, rtl-sdr-devel
+#BuildRequires:    libusb1-devel
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Group:            Applications/Engineering
+Summary:          Common software API for various radio hardware
+Source0:          %{name}-%{version}-%{git_suffix}.tar.bz2
+# Patch sent upstream
+Patch0:           gr-osmosdr-0.0.1-doxygen-fix.patch
+# Patch sent upstream
+Patch1:           gr-osmosdr-0.0.1-docdir-override.patch
+
+%description
+Primarily gr-osmosdr supports the OsmoSDR hardware, but it also
+offers a wrapper functionality for FunCube Dongle,  Ettus UHD
+and rtl-sdr radios. By using gr-osmosdr source you can take
+advantage of a common software api in your application(s)
+independent of the underlying radio hardware.
+
+%package devel
+Summary:          Development files for gr-osmosdr
+Group:            Applications/Engineering
+Requires:         %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+Development files for gr-osmosdr.
+
+%package doc
+Summary:        Documentation files for gr-osmosdr
+Group:          Applications/Engineering
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
+
+%description doc
+Documentation files for gr-osmosdr.
+
+%prep
+%setup -q
+%patch0 -p1 -b .doxygen-fix
+%patch1 -p1 -b .docdir-override
+
+%build
+mkdir build
+cd build
+%cmake -DENABLE_DOXYGEN=on -DGR_PKG_DOC_DIR=%{_docdir}/%{name}-%{version} ..
+make %{?_smp_mflags}
+
+%install
+cd build
+make install DESTDIR=%{buildroot}
+
+# Install examples
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/examples
+install -p -m 0644 ../apps/*.grc %{buildroot}%{_docdir}/%{name}-%{version}/examples
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%exclude %{_docdir}/%{name}-%{version}/html
+%exclude %{_docdir}/%{name}-%{version}/xml
+%exclude %{_docdir}/%{name}-%{version}/examples
+%doc AUTHORS COPYING
+%{_libdir}/*.so.*
+%{python_sitearch}/*
+%{_datadir}/gnuradio/grc/blocks/*
+
+%files devel
+%{_includedir}/osmosdr
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+
+%files doc
+%doc %{_docdir}/%{name}-%{version}/html
+%doc %{_docdir}/%{name}-%{version}/xml
+%doc %{_docdir}/%{name}-%{version}/examples
+
+%changelog
+* Tue Apr  9 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 0.0.1-2.20130403gite85c68d9
+- Packaged doxygen docs and examples
+- Various improvements according to comments in the merge review
+
+* Wed Apr  3 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 0.0.1-1.20130403gite85c68d9
+- Initial version
diff --git a/sources b/sources
index e69de29..06dda47 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+197790bfffded2d9a5a8542aae2ca02f  gr-osmosdr-0.0.1-20130403gite85c68d9.tar.bz2


More information about the scm-commits mailing list