X-Git-Url: http://git.onelab.eu/?p=bbn_80211.git;a=blobdiff_plain;f=bbn_80211.spec;h=8a8fe60e0517afb90c49adfc29e1aab26c15e61b;hp=3722530911c99deed28e855b675afc79f0eb9a8f;hb=38b00f093f7b313434b75502b6e5f1f511a143c9;hpb=627428a5b290662fc44788af30b768805970c132

diff --git a/bbn_80211.spec b/bbn_80211.spec
index 3722530..8a8fe60 100644
--- a/bbn_80211.spec
+++ b/bbn_80211.spec
@@ -7,10 +7,13 @@
 # File: bbn_80211.tar.gz stored locally at:
 #
 %define name bbn_80211
-%define version 3.2.2 
-%define release 1.0
+%define version 3.2.2
+%define release 3
 %define actual_name %{name}-%{version}
 
+# for module-tools
+%define module_taglevel_varname release
+
 Name: %{name}
 Summary: Very basic 802.11 transceiver code from BBN
 Version: %{version}
@@ -24,7 +27,7 @@ BuildRoot: %{_tmppath}/%{actual_name}
 
 BuildRequires:  swig gnuradio gnuradio-devel
 
-Requires: swig gnuradio
+Requires: swig gnuradio boost
 
 %description
 Basic 802.11 transmitter and receiver, which is able 
@@ -33,7 +36,11 @@ over the air reliably at 1Mbps and partially at 2Mbps.
 
 %prep
 %setup -q -n %{actual_name}
-
+# patch bbn_tap.cc that lacks an include (critical on f12)
+sed -i '
+/#include <stdexcept>/ a\
+#include <stdio.h>
+' gr-bbn/src/bbn/bbn_tap.cc 
 
 %build
 #PKG_CONFIG_PATH="/usr/lib/pkgconfig"
@@ -61,11 +68,11 @@ ldconfig
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -n %{name}
+%files 
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_includedir}/gnuradio/*
-%{_libdir}/python2.5/site-packages/
+/usr/lib*/python*/site-packages/
 %dir %{_datadir}/%{actual_name}
 %{_datadir}/%{actual_name}/*
 
@@ -74,6 +81,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog -n bbn_80211
+* Fri Jan 29 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bbn_80211-3.2.2-3
+- add explicit dep to boost
+
+* Wed Jan 20 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bbn_80211-3.2.2-2
+- rework for f12
+
 * Mon Oct 5 2009 Thierry Turletti <turletti@sophia.inria.fr> 3.2.2-1.1
 - fixed errors with rpmlint