diff --git a/urlscan-0.9.10.tar.gz b/urlscan-0.9.10.tar.gz deleted file mode 100644 index 1c076d6..0000000 --- a/urlscan-0.9.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0fbaf7f820fc6ff20c6f1a429c98cb240f1da7eabceed5e3d88740558e81cd2d -size 34263 diff --git a/urlscan-1.0.0.tar.gz b/urlscan-1.0.0.tar.gz new file mode 100644 index 0000000..3987554 --- /dev/null +++ b/urlscan-1.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b12da2c3ee45ae21c80eed2fc40866b3b0b82a39e70ce1ad458b65af7334728a +size 34313 diff --git a/urlscan.changes b/urlscan.changes index 7f5c645..af7d5fa 100644 --- a/urlscan.changes +++ b/urlscan.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Jun 2 13:50:51 UTC 2023 - Dr. Werner Fink + +- Update to urlscan 1.0.0 + * Fix search with -c flag. Fixes #131. + * Add support for IPv6 URLs. Closes #127 + * Mark items in url queue with a * + * Add version flag + * Update to pyproject.toml/hatch for builds +- Switch over to flavoured build + * Is there any way to have one major package e.g. for repeating + docs for the various flavoured sub packages? + ------------------------------------------------------------------- Tue Dec 6 13:06:46 UTC 2022 - Dirk Müller diff --git a/urlscan.spec b/urlscan.spec index 256b851..ab2ab4f 100644 --- a/urlscan.spec +++ b/urlscan.spec @@ -1,7 +1,7 @@ # # spec file for package urlscan # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define python_flavor python3 Name: urlscan -Version: 0.9.10 +Version: 1.0.0 Release: 0 Summary: An other URL extractor/viewer License: GPL-2.0-or-later @@ -26,16 +26,22 @@ 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: python3-base -BuildRequires: python3-devel -BuildRequires: python3-rpm-macros -BuildRequires: python3-setuptools +BuildRequires: python-rpm-macros BuildRequires: sed -Requires: python3 -Requires: python3-base -Requires: python3-urwid +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 @@ -45,33 +51,39 @@ quoted-printable and base64 encoding. %prep %setup -q +install -m 0644 %{SOURCE1} muttrc %build -%python3_build +SETUPTOOLS_SCM_PRETEND_VERSION="%{version}" +export SETUPTOOLS_SCM_PRETEND_VERSION +%pyproject_wheel %install -%python3_install -mkdir -p %{buildroot}%{_defaultdocdir}/%{name} -if test -e %{buildroot}%{_datadir}/doc/%{name}* +%pyproject_install +%python_expand mkdir -p %{buildroot}%{_defaultdocdir}/%{$python_prefix}-%{myname} +if test -e %{buildroot}%{_datadir}/doc/%{myname}* then - rm -vf %{buildroot}%{_datadir}/doc/%{name}*/COPYING - mv %{buildroot}%{_datadir}/doc/%{name}*/* \ - %{buildroot}%{_defaultdocdir}/%{name}/ + rm -f %{buildroot}%{_datadir}/doc/%{myname}*/LICENSE fi rm -rf %{buildroot}%{_datadir}/doc/%{name}* -install -m 0644 %{SOURCE1} %{buildroot}%{_defaultdocdir}/%{name} -chmod 755 %{buildroot}%{python_sitelib}/%{name}/__main__* -sed -ri '1 { s@(/usr/bin/)env *@\1@ }' %{buildroot}%{python_sitelib}/%{name}/__main__* -%fdupes %{buildroot} +%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} -%files -%license COPYING -%{_bindir}/%{name} -%{python_sitelib}/%{name} -%{python_sitelib}/%{name}-%{version}-py*.egg-info -%{_mandir}/man1/%{name}.1%{?ext_man} -%dir %{_defaultdocdir}/%{name}/ -%doc %{_defaultdocdir}/%{name}/muttrc -%doc %{_defaultdocdir}/%{name}/README.md +%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} +%{python_sitelib}/%{myname} +%{python_sitelib}/%{myname}-%{version}*-info +%license LICENSE +%doc README.md muttrc %changelog