From e68daabc8627a580903f9a0934e72294a7130b24843e00ae0cd3acb00077d2dd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 24 Nov 2016 20:24:37 +0000 Subject: [PATCH] Accepting request 441517 from science 1 OBS-URL: https://build.opensuse.org/request/show/441517 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnuradio?expand=0&rev=20 --- gnuradio.changes | 7 +++++++ gnuradio.spec | 31 +++++++++++++++---------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/gnuradio.changes b/gnuradio.changes index f462b8b..a273fad 100644 --- a/gnuradio.changes +++ b/gnuradio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 20 19:35:33 UTC 2016 - jengelh@inai.de + +- Rename soname macro to sover because it did not reflect the + SONAME. +- RPM group reclassification + ------------------------------------------------------------------- Sat Sep 3 19:50:42 UTC 2016 - wk@ire.pw.edu.pl diff --git a/gnuradio.spec b/gnuradio.spec index 87c00fc..09f6e0e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,8 +19,8 @@ Name: gnuradio Version: 3.7.10.1 Release: 0 -%define soname 3_7_10-0_0_0 -%define soname_volk 1_3 +%define sover 3_7_10-0_0_0 +%define sover_volk 1_3 Summary: GNU software radio License: GPL-3.0+ Group: Productivity/Hamradio/Other @@ -96,12 +96,12 @@ performance wireless devices into software problems. This package contains the wxgui blocks -%package -n libgnuradio-%{soname} +%package -n libgnuradio-%{sover} Summary: Libraries for GNU Radio Group: System/Libraries Obsoletes: libgnuradio0 -%description -n libgnuradio-%{soname} +%description -n libgnuradio-%{sover} GNU Radio is a collection of software that when combined with minimal hardware, allows the construction of radios where the actual waveforms transmitted and received are defined by software. What this means is @@ -110,13 +110,13 @@ performance wireless devices into software problems. This package contains the libraries for GNU Radio. -%package -n libvolk%{soname_volk} +%package -n libvolk%{sover_volk} Summary: Libraries for GNU Radio Group: System/Libraries Conflicts: libgnuradio0 Obsoletes: libvolk0_0_0 -%description -n libvolk%{soname_volk} +%description -n libvolk%{sover_volk} GNU Radio is a collection of software that when combined with minimal hardware, allows the construction of radios where the actual waveforms transmitted and received are defined by software. What this means is @@ -127,7 +127,7 @@ This package contains the Vector-Optimized Library of Kernels (VOLK) %package devel Summary: Deveopment files for GNU Radio -Group: Development/Libraries/Other +Group: Development/Libraries/C and C++ Requires: %{name} = %{version} %description devel @@ -142,7 +142,7 @@ applications that use GNU Radio. %package doc Summary: GNU Radio documentation -Group: Documentation/Other +Group: Documentation/HTML Requires: %{name} = %{version} BuildArch: noarch @@ -230,13 +230,13 @@ rm -rf %{buildroot}%{_prefix}/libexec %fdupes -s %{buildroot}%{_includedir} %fdupes -s %{buildroot}%{_libdir} -%post -n libgnuradio-%{soname} -p /sbin/ldconfig +%post -n libgnuradio-%{sover} -p /sbin/ldconfig -%post -n libvolk%{soname_volk} -p /sbin/ldconfig +%post -n libvolk%{sover_volk} -p /sbin/ldconfig -%postun -n libgnuradio-%{soname} -p /sbin/ldconfig +%postun -n libgnuradio-%{sover} -p /sbin/ldconfig -%postun -n libvolk%{soname_volk} -p /sbin/ldconfig +%postun -n libvolk%{sover_volk} -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -279,12 +279,11 @@ rm -rf %{buildroot}%{_prefix}/libexec %{_datadir}/gnuradio/grc/blocks/variable_static_text.xml %{_datadir}/gnuradio/grc/blocks/variable_text_box.xml -%files -n libgnuradio-%{soname} +%files -n libgnuradio-%{sover} %defattr(-,root,root,-) -%{_libdir}/lib*.so.* -%exclude %{_libdir}/libvolk*.so.* +%{_libdir}/libgnuradio*.so.* -%files -n libvolk%{soname_volk} +%files -n libvolk%{sover_volk} %defattr(-,root,root,-) %{_libdir}/libvolk*.so.*