Accepting request 1092579 from utilities

- Also remove left over curly braces at the end of require lines

- Removed invalid Recommends line 

- Reintroduce removing /usr/bin/env from shebang lines as well as
  duplicate files them selfs

- 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.

- 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?

OBS-URL: https://build.opensuse.org/request/show/1092579
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/urlscan?expand=0&rev=13

urlscan-0.9.10.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0fbaf7f820fc6ff20c6f1a429c98cb240f1da7eabceed5e3d88740558e81cd2d
-size 34263

urlscan-1.0.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b12da2c3ee45ae21c80eed2fc40866b3b0b82a39e70ce1ad458b65af7334728a
+size 34313

urlscan.changes

@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Mon Jun 12 12:26:37 UTC 2023 - Dr. Werner Fink <werner@suse.de>
+
+- Also remove left over curly braces at the end of require lines
+
+-------------------------------------------------------------------
+Mon Jun 12 11:54:29 UTC 2023 - Dr. Werner Fink <werner@suse.de>
+
+- Removed invalid Recommends line 
+
+-------------------------------------------------------------------
+Mon Jun 12 11:45:12 UTC 2023 - Dr. Werner Fink <werner@suse.de>
+
+- 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 <dimstar@opensuse.org>
+
+- 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 <werner@suse.de>
+
+- 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 <dmueller@suse.com>
 

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
@@ -16,9 +16,9 @@
 #
 
 
-%define python_flavor python3
+%define pythons 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
@@ -27,15 +27,19 @@ URL:            https://github.com/firecat53/urlscan
 Source0:        https://github.com/firecat53/urlscan/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        muttrc
 BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
 BuildRequires:  python3-base
 BuildRequires:  python3-devel
-BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-hatch_vcs
+BuildRequires:  python3-hatchling
+BuildRequires:  python3-pip
 BuildRequires:  python3-setuptools
+BuildRequires:  python3-wheel
 BuildRequires:  sed
-Requires:       python3
 Requires:       python3-base
-Requires:       python3-urwid
+Requires:       python3-urwid >= 1.2.1
 BuildArch:      noarch
+%global myname  %name
 
 %description
 The urlscan utility displays URLs found in an email message with
@@ -45,33 +49,33 @@ 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
+%pyproject_install
-mkdir -p %{buildroot}%{_defaultdocdir}/%{name}
+%{python_expand mkdir -p %{buildroot}%{_defaultdocdir}/%{$python_prefix}-%{myname}
-if test -e %{buildroot}%{_datadir}/doc/%{name}*
+ chmod 755 %{buildroot}%{$python_sitelib}/%{name}/__main__*
+ sed -ri '1 { s@(/usr/bin/)env +@\1@ }' %{buildroot}%{$python_sitelib}/%{name}/__main__*
+ %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 -vf %{buildroot}%{_datadir}/doc/%{name}*/COPYING
+    rm -f %{buildroot}%{_datadir}/doc/%{myname}*/LICENSE
-   mv %{buildroot}%{_datadir}/doc/%{name}*/* \
-      %{buildroot}%{_defaultdocdir}/%{name}/
 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}
 
 %files
-%license COPYING
+%{_bindir}/%{myname}
-%{_bindir}/%{name}
+%{_mandir}/man1/%{myname}.1%{?ext_man}
-%{python_sitelib}/%{name}
+%{python_sitelib}/%{myname}
-%{python_sitelib}/%{name}-%{version}-py*.egg-info
+%{python_sitelib}/%{myname}-%{version}*-info
-%{_mandir}/man1/%{name}.1%{?ext_man}
+%license LICENSE
-%dir %{_defaultdocdir}/%{name}/
+%doc README.md muttrc
-%doc %{_defaultdocdir}/%{name}/muttrc
-%doc %{_defaultdocdir}/%{name}/README.md
 
 %changelog