From 50d215aebcb1c44cf578e8baba10d137a2f1132f Mon Sep 17 00:00:00 2001 From: Marcin Dulak Date: May 26 2017 18:18:01 +0000 Subject: default to python2 scripts --- diff --git a/python-idstools.spec b/python-idstools.spec index 3beb18a..419763f 100644 --- a/python-idstools.spec +++ b/python-idstools.spec @@ -1,5 +1,6 @@ %if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} >= 7) %global with_python3 1 +%define default_python3 0 %endif %global upstream_name py-idstools @@ -7,7 +8,7 @@ Name: python-%{pname} Version: 0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Snort and Suricata Rule and Event Utilities License: BSD URL: https://github.com/jasonish/py-idstools @@ -78,7 +79,6 @@ done popd - %if 0%{?with_python3} %{py3_install} pushd %{buildroot}%{_bindir} @@ -87,11 +87,21 @@ for file2 in `find . -type f -name '*-%{python2_version}'`; do file=`basename -s -%{python2_version} $file2` mv -v $file $file-%{python3_version} ln -sv $file-%{python3_version} $file-3 -ln -sv $file-%{python3_version} $file done popd %endif +pushd %{buildroot}%{_bindir} +for file2 in `find . -type f -name '*-%{python2_version}'`; do +file=`basename -s -%{python2_version} $file2` +%if 0%{?default_python3} +ln -sv $file-%{python3_version} $file +%else +ln -sv $file-%{python2_version} $file +%endif +done +popd + %check %{__python2} setup.py nosetests @@ -116,6 +126,15 @@ popd %{_bindir}/%{pname}-u2fast-%{python2_version} %{_bindir}/%{pname}-u2json-2 %{_bindir}/%{pname}-u2json-%{python2_version} +%if !0%{?default_python3} +%{_bindir}/%{pname}-eve2pcap +%{_bindir}/%{pname}-gensidmsgmap +%{_bindir}/%{pname}-rulecat +%{_bindir}/%{pname}-rulemod +%{_bindir}/%{pname}-u2eve +%{_bindir}/%{pname}-u2fast +%{_bindir}/%{pname}-u2json +%endif %{python2_sitelib}/%{pname}-%{version}-py%{python2_version}.egg-info %{python2_sitelib}/%{pname} %doc README.rst @@ -124,27 +143,29 @@ popd %if 0%{?with_python3} %files -n python%{python3_pkgversion}-%{pname} -%{_bindir}/%{pname}-eve2pcap %{_bindir}/%{pname}-eve2pcap-3 %{_bindir}/%{pname}-eve2pcap-%{python3_version} -%{_bindir}/%{pname}-gensidmsgmap %{_bindir}/%{pname}-gensidmsgmap-3 %{_bindir}/%{pname}-gensidmsgmap-%{python3_version} -%{_bindir}/%{pname}-rulecat %{_bindir}/%{pname}-rulecat-3 %{_bindir}/%{pname}-rulecat-%{python3_version} -%{_bindir}/%{pname}-rulemod %{_bindir}/%{pname}-rulemod-3 %{_bindir}/%{pname}-rulemod-%{python3_version} -%{_bindir}/%{pname}-u2eve %{_bindir}/%{pname}-u2eve-3 %{_bindir}/%{pname}-u2eve-%{python3_version} -%{_bindir}/%{pname}-u2fast %{_bindir}/%{pname}-u2fast-3 %{_bindir}/%{pname}-u2fast-%{python3_version} -%{_bindir}/%{pname}-u2json %{_bindir}/%{pname}-u2json-3 %{_bindir}/%{pname}-u2json-%{python3_version} +%if 0%{?default_python3} +%{_bindir}/%{pname}-eve2pcap +%{_bindir}/%{pname}-gensidmsgmap +%{_bindir}/%{pname}-rulecat +%{_bindir}/%{pname}-rulemod +%{_bindir}/%{pname}-u2eve +%{_bindir}/%{pname}-u2fast +%{_bindir}/%{pname}-u2json +%endif %{python3_sitelib}/%{pname}-%{version}-py%{python3_version}.egg-info %{python3_sitelib}/%{pname} %doc README.rst @@ -154,6 +175,9 @@ popd %changelog +* Fri May 26 2017 Marcin Dulak - 0.6.1-2 +- default to python2 scripts + * Thu May 25 2017 Marcin Dulak - 0.6.1-1 - upstream update