X-Git-Url: https://git.pld-linux.org/?p=packages%2Fscapy.git;a=blobdiff_plain;f=scapy.spec;h=cea21482b59d781f20222d977f4dd8e8f7578d6a;hp=f11e0f57b76a6c56a055b8c757d11725c22a9427;hb=49c486c26dc95fbcf316d5d6b7177ad78478b265;hpb=b7f2ae203e4bf26e8137fa5fcc0323c7873a973b

diff --git a/scapy.spec b/scapy.spec
index f11e0f5..cea2148 100644
--- a/scapy.spec
+++ b/scapy.spec
@@ -2,29 +2,28 @@
 # - package and add Suggests:
 # * Vpython (http://www.vpython.org/)
 
-%define _hg_rev 834b9f8a3c23
 Summary:	Interactive packet manipulation program
-Summary(pl.UTF-8):	Interaktywny program do manipulacji pakietami.
+Summary(pl.UTF-8):	Interaktywny program do manipulacji pakietami
 Name:		scapy
-Version:	2.0.1
+Version:	2.2.0
 Release:	2
 License:	GPL
 Group:		Applications/Networking
-Source0:	http://hg.secdev.org/scapy/archive/%{_hg_rev}.tar.bz2
-# Source0-md5:	7356de9660216844ad6ae60ef8febf23
+Source0:	http://www.secdev.org/projects/scapy/files/%{name}-%{version}.tar.gz
+# Source0-md5:	406990bd8da1f4958b354b4b6fc4b3eb
 URL:		http://www.secdev.org/projects/scapy/
 BuildRequires:	rpm-pythonprov
 BuildRequires:	sphinx-pdg
 Requires:	python-libdnet
 Requires:	python-pylibpcap
-Suggests:	graphviz-python
-Suggests:	python-crypto
-Suggests:	python-gnuplot
+Suggests:	python-Crypto
+Suggests:	python-Gnuplot
+Suggests:	python-pygraphviz
 Suggests:	python-pyx
 Suggests:	sox
 Suggests:	texlive
 Suggests:	texlive-fonts-type1-bluesky
-
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,7 +36,7 @@ can replace hping, 85% of nmap, arpspoof, arp-sk, arping, tcpdump,
 tethereal, p0f, etc.). It also performs very well at a lot of other
 specific tasks that most other tools can't handle, like sending
 invalid frames, injecting your own 802.11 frames, combining technics
-(VLAN hopping+ARP cache poisoning, VOIP decoding on WEP encrypted
+(VLAN hopping+ARP cache poisoning, VoIP decoding on WEP encrypted
 channel, ...), etc.
 
 %description -l pl.UTF-8
@@ -51,11 +50,11 @@ nmapa, arpspoof, arp-sk, arping, tcpdump, tethereal, p0f itp.). Radzi
 sobie rownież z innymi specyficznymi zadaniami, którym inne narzedzia
 nie są w stanie podołać - wysyłanie nieprawidlowych ramek,
 wstrzykiwanie własnych ramek 802.11, łączenie technik (przeskakiwanie
-VLANów+zatruwanie ARP cache, dekodowanie VIOP na kanale zabezpieczonym
+VLANów+zatruwanie ARP cache, dekodowanie VoIP na kanale zabezpieczonym
 WEP, ...) itp.
 
 %prep
-%setup -q -n %{name}-%{_hg_rev}
+%setup -q
 
 %build
 %{__python} setup.py build
@@ -69,12 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 	--root=$RPM_BUILD_ROOT \
 	--optimize=2
 
-rm -Rf $RPM_BUILD_ROOT/%{py_sitescriptdir}/%{name}/*.py
-rm -Rf $RPM_BUILD_ROOT/%{py_sitescriptdir}/%{name}/arch/*.py
-rm -Rf $RPM_BUILD_ROOT/%{py_sitescriptdir}/%{name}/asn1/*.py
-rm -Rf $RPM_BUILD_ROOT/%{py_sitescriptdir}/%{name}/layers/*.py
-rm -Rf $RPM_BUILD_ROOT/%{py_sitescriptdir}/%{name}/modules/*.py
-rm -Rf $RPM_BUILD_ROOT/%{py_sitescriptdir}/%{name}/tools/*.py
+%py_postclean
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,17 +79,21 @@ rm -rf $RPM_BUILD_ROOT
 #%doc doc/scapy/_build/html/_static/*
 #%doc doc/scapy/_build/html/_images/*
 #%doc doc/scapy/_build/html/_sources/*.txt
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/*%{name}
 %{py_sitescriptdir}/*.egg-info
 %dir %{py_sitescriptdir}/%{name}
 %dir %{py_sitescriptdir}/%{name}/arch
+%dir %{py_sitescriptdir}/%{name}/arch/windows
 %dir %{py_sitescriptdir}/%{name}/asn1
+%dir %{py_sitescriptdir}/%{name}/crypto
 %dir %{py_sitescriptdir}/%{name}/layers
 %dir %{py_sitescriptdir}/%{name}/modules
 %dir %{py_sitescriptdir}/%{name}/tools
 %{py_sitescriptdir}/%{name}/*.py[co]
 %{py_sitescriptdir}/%{name}/arch/*.py[co]
+%{py_sitescriptdir}/%{name}/arch/windows/*.py[co]
 %{py_sitescriptdir}/%{name}/asn1/*.py[co]
+%{py_sitescriptdir}/%{name}/crypto/*.py[co]
 %{py_sitescriptdir}/%{name}/layers/*.py[co]
 %{py_sitescriptdir}/%{name}/modules/*.py[co]
 %{py_sitescriptdir}/%{name}/tools/*.py[co]