X-Git-Url: http://git.onelab.eu/?p=bbn_80211.git;a=blobdiff_plain;f=bbn_80211.spec;h=e1617f11a93ffe2f00e902191e0308ca0a62374d;hp=f118ba12177c86ef57b4b7cc6f13a8aca5c1cf43;hb=636c9b719cb7e4d4b1ed02b8495257eaff624e68;hpb=3b8c47e790454698ee4841129ce89cae54aca7ea

diff --git a/bbn_80211.spec b/bbn_80211.spec
index f118ba1..e1617f1 100644
--- a/bbn_80211.spec
+++ b/bbn_80211.spec
@@ -7,8 +7,8 @@
 # File: bbn_80211.tar.gz stored locally at:
 #
 %define name bbn_80211
-%define version 3.2.2 
-%define release 1
+%define version 3.2.2
+%define release 4
 %define actual_name %{name}-%{version}
 
 # for module-tools
@@ -27,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 
@@ -36,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"
@@ -64,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}/*
 
@@ -77,6 +81,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog -n bbn_80211
+* Thu Feb 16 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bbn_80211-3.2.2-4
+- bugfix for packaging on 64bits
+
+* 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