From 8451672690ab9060d22700c05aa38d756fb985d3 Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: Dec 14 2011 23:33:37 +0000 Subject: New version Used macros instead of variables in spec Dropped sdcc hack, was needed by obsoleted libusrp --- diff --git a/.gitignore b/.gitignore index ab043ef..e8ee128 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gnuradio-3.5.0rc0.tar.gz +gnuradio-*.tar.gz diff --git a/gnuradio.spec b/gnuradio.spec index 0ba2df1..2fa8eba 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -5,14 +5,11 @@ #%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a # For versions published as attachment (strange) -%global attachment_id 281 - -# For pre-release versions -%global prerelease rc0 +%global attachment_id 288 Name: gnuradio Version: 3.5.0 -Release: 0.2.%{prerelease}%{?dist} +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -20,7 +17,7 @@ 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: http://gnuradio.org/redmine/attachments/download/%{attachment_id}/gnuradio-%{version}%{prerelease}.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} | \ @@ -102,7 +99,7 @@ Requires: %{name} = %{version}-%{release} GNU Radio examples %prep -%setup -q -n %{name}-%{version}%{prerelease} +%setup -q #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -124,15 +121,14 @@ find . -name "*_moc.cc" -exec rm {} \; sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # make with -j1 and compile without strict-aliasing -make %{?my_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +make %{?my_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing" %install -rm -rf $RPM_BUILD_ROOT -export PATH=%{_libexecdir}/sdcc:$PATH -make install DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -n gnuradio -p /sbin/ldconfig %postun -n gnuradio -p /sbin/ldconfig @@ -165,6 +161,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gnuradio/examples %changelog +* Tue Dec 13 2011 Jaroslav Škarvada - 3.5.0-1 +- New version +- Used macros instead of variables in spec +- Dropped sdcc hack, was needed by obsoleted libusrp + * Sun Dec 4 2011 Jaroslav Škarvada - 3.5.0-0.2.rc0 - Added python-cheetah dependency Resolves: rhbz#759834 diff --git a/sources b/sources index 4a9a6f9..497ffd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -33c2b0300e892d39f141559003f1a819 gnuradio-3.5.0rc0.tar.gz +a1dd4953f67807ce8d265aec85561584 gnuradio-3.5.0.tar.gz