Update rpm spec files for Python 3

This commit is contained in:
dmiller 2023-01-17 17:18:20 +00:00
parent 72a6a7f18b
commit 153be6f589
2 changed files with 7 additions and 13 deletions

View file

@ -13,10 +13,6 @@
%define release 1
%define _prefix /usr
# Find where Python modules are installed. See
# http://fedoraproject.org/wiki/Packaging/Python.
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Summary: Network exploration tool and security scanner
Name: %{name}
Version: %{version}
@ -35,7 +31,8 @@ URL: https://nmap.org
# modules were installed so it's not dependent on any particular ABI.
AutoReqProv: no
# For Ndiff.
Requires: python >= 2.4
BuildRequires: python3-devel
Requires: python >= 3.0
# RPM can't be relocatable until I stop storing path info in the binary.
# Prefix: %{_prefix}
@ -96,8 +93,8 @@ gzip $RPM_BUILD_ROOT%{_mandir}/man1/* || :
%{_datadir}/nmap
%{_bindir}/ndiff
# Ndiff is now a module and has e.g. /usr/lib/python2.4/site-packages/ndiff.py, /usr/lib/python2.4/site-packages/ndiff.pyc
%{python_sitelib}/ndiff*
# Ndiff is now a module and has e.g. /usr/lib/python3.10/site-packages/ndiff.py, /usr/lib/python3.10/site-packages/ndiff.pyc
%pycached %{python3_sitelib}/ndiff.py
%doc %{_prefix}/share/man/man1/ndiff.1.gz
# Ncat subpackage

View file

@ -7,10 +7,6 @@
%define release 1
%define _prefix /usr
# Find where Python modules are installed. See
# http://fedoraproject.org/wiki/Packaging/Python.
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Summary: Multi-platform graphical Nmap frontend and results viewer
Name: %{name}
Version: %{version}
@ -29,7 +25,8 @@ BuildArch: noarch
# setup.py takes care of adjusting sys.path to point to wherever the
# modules were installed so it's not dependent on any particular ABI.
AutoReqProv: no
Requires: python >= 2.4, nmap, pygtk2
BuildRequires: python3-devel
Requires: python >= 3.0, nmap, python-gobject, gtk3
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-root
@ -78,7 +75,7 @@ gzip $RPM_BUILD_ROOT%{_mandir}/man1/* || :
%{_bindir}/nmapfe
%{_bindir}/xnmap
# This gets the modules and the .egg-info file if it was installed.
%{python_sitelib}/*
%pycached %{python3_sitelib}/*
%{_datadir}/zenmap
%{_datadir}/applications/*.desktop