diff --git a/urlscan.changes b/urlscan.changes index af7d5fa..24d5f72 100644 --- a/urlscan.changes +++ b/urlscan.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Jun 12 11:45:12 UTC 2023 - Dr. Werner Fink + +- Reintroduce removing /usr/bin/env from shebang lines as well as + duplicate files them selfs + +------------------------------------------------------------------- +Mon Jun 12 11:09:31 UTC 2023 - Dominique Leuenberger + +- Do not package this as multi-python flavors: urlscan is a simple + leaf application written in python. Its python code is not + consumed by others. + ------------------------------------------------------------------- Fri Jun 2 13:50:51 UTC 2023 - Dr. Werner Fink diff --git a/urlscan.spec b/urlscan.spec index ab2ab4f..cca98fb 100644 --- a/urlscan.spec +++ b/urlscan.spec @@ -16,7 +16,7 @@ # -%define python_flavor python3 +%define pythons python3 Name: urlscan Version: 1.0.0 Release: 0 @@ -26,22 +26,21 @@ Group: Productivity/Networking/Web/Browsers URL: https://github.com/firecat53/urlscan Source0: https://github.com/firecat53/urlscan/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: muttrc -BuildRequires: %{python_module base} -BuildRequires: %{python_module devel} -BuildRequires: %{python_module hatch_vcs} -BuildRequires: %{python_module hatchling} -BuildRequires: %{python_module pip} -BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: python3-base +BuildRequires: python3-devel +BuildRequires: python3-hatch_vcs +BuildRequires: python3-hatchling +BuildRequires: python3-pip +BuildRequires: python3-setuptools +BuildRequires: python3-wheel BuildRequires: sed Recommends: %{name}-doc = %{version} Requires: %{python_module base} Requires: %{python_module urwid >= 1.2.1} BuildArch: noarch %global myname %name -%python_subpackages %description The urlscan utility displays URLs found in an email message with @@ -61,26 +60,19 @@ export SETUPTOOLS_SCM_PRETEND_VERSION %install %pyproject_install %python_expand mkdir -p %{buildroot}%{_defaultdocdir}/%{$python_prefix}-%{myname} +%python_expand chmod 755 %{buildroot}%{$python_sitelib}/%{name}/__main__* +%python_expand sed -ri '1 { s@(/usr/bin/)env +@\1@ }' %{buildroot}%{$python_sitelib}/%{name}/__main__* +%python_expand %fdupes %{buildroot}%{$python_sitelib} +sed -ri '1 { s@(/usr/bin/)env +@\1@;s@(/python3)\.[[:digit:]]+@\1@ }' %{buildroot}%{_bindir}/%{name} if test -e %{buildroot}%{_datadir}/doc/%{myname}* then rm -f %{buildroot}%{_datadir}/doc/%{myname}*/LICENSE fi rm -rf %{buildroot}%{_datadir}/doc/%{name}* -%python_clone -a %{buildroot}%{_bindir}/%{myname} -%python_clone -a %{buildroot}%{_mandir}/man1/%{myname}.1 -%python_expand chmod 755 %{buildroot}%{$python_sitelib}/%{myname}/__main__* -%python_expand sed -ri '1 { s@(/usr/bin/)env *@\1@ }' %{buildroot}%{$python_sitelib}/%{myname}/__main__* -%python_expand %fdupes %{buildroot}%{$python_sitelib} -%post -%python_install_alternative %{myname} - -%postun -%python_uninstall_alternative %{myname} - -%files %{python_files} -%python_alternative %{_bindir}/%{myname} -%python_alternative %{_mandir}/man1/%{myname}.1%{?ext_man} +%files +%{_bindir}/%{myname} +%{_mandir}/man1/%{myname}.1%{?ext_man} %{python_sitelib}/%{myname} %{python_sitelib}/%{myname}-%{version}*-info %license LICENSE