diff --git a/.gitignore b/.gitignore index 48813b4..dc6f52d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,2 @@ /urlscan-0.8.6.tar.gz /urlscan-0.8.7.tar.gz -/urlscan-0.9.3.tar.gz -/urlscan-0.9.4.tar.gz -/urlscan-0.9.5.tar.gz -/urlscan-0.9.6.tar.gz -/urlscan-0.9.8.tar.gz -/urlscan-0.9.9.tar.gz -/urlscan-0.9.10.tar.gz -/urlscan-1.0.0.tar.gz -/urlscan-1.0.1.tar.gz -/urlscan-1.0.2.tar.gz -/urlscan-1.0.4.tar.gz -/urlscan-1.0.6.tar.gz -/urlscan-1.0.7.tar.gz -/urlscan-1.0.8.tar.gz -/urlscan-1.0.9.tar.gz -/urlscan-1.1.2.tar.gz -/urlscan-1.1.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index e5d3919..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,13 +0,0 @@ -upstream_project_url: https://github.com/firecat53/urlscan -copy_upstream_release_description: false -upstream_tag_template: "{version}" - -jobs: - - job: pull_from_upstream - trigger: release - dist_git_branches: - - fedora-rawhide - - job: koji_build - trigger: commit - dist_git_branches: - - fedora-rawhide diff --git a/README.packit b/README.packit deleted file mode 100644 index 68a092a..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 1.16.2.post1.dev8+g69d783e81. diff --git a/changelog b/changelog deleted file mode 100644 index c156fa7..0000000 --- a/changelog +++ /dev/null @@ -1,68 +0,0 @@ -* Sat Jan 22 2022 Fedora Release Engineering - 0.9.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Dec 22 2021 Ankur Sinha - 0.9.8-1 -- Update to latest patch release -- Use pyproject macros - -* Fri Jul 23 2021 Fedora Release Engineering - 0.9.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 0.9.6-2 -- Rebuilt for Python 3.10 - -* Sun Mar 28 2021 Ankur Sinha - 0.9.6-1 -- Update to latest release -- Update patch - -* Wed Jan 27 2021 Fedora Release Engineering - 0.9.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Oct 01 2020 Ankur Sinha - 0.9.5-1 -- Update to new release - -* Wed Jul 29 2020 Fedora Release Engineering - 0.9.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 0.9.4-4 -- Rebuilt for Python 3.9 - -* Fri Jan 31 2020 Fedora Release Engineering - 0.9.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 0.9.4-2 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Sat Aug 31 2019 Ankur Sinha - 0.9.4-1 -- Update to new version - -* Mon Aug 19 2019 Miro Hrončok - 0.9.3-3 -- Rebuilt for Python 3.8 - -* Sat Jul 27 2019 Fedora Release Engineering - 0.9.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Jul 19 2019 Ankur Sinha - 0.9.3-1 -- Update to new version - -* Sun Feb 03 2019 Fedora Release Engineering - 0.8.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 0.8.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 0.8.7-2 -- Rebuilt for Python 3.7 - -* Fri Mar 02 2018 Filip Szymański - 0.8.7-1 -- Update to 0.8.7 - -* Fri Feb 09 2018 Fedora Release Engineering - 0.8.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Dec 22 2017 Filip Szymański - 0.8.6-2 -- Copy muttrc file in %%prep section - -* Thu Dec 21 2017 Filip Szymański - 0.8.6-1 -- Initial release - diff --git a/sources b/sources index 19a2282..2c37901 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urlscan-1.1.2.tar.gz) = 2bf008a8ce60df2a0997f3c2161975578c19e0b130454411f9e97d02c70096c3841492e4607be808cd575c6dd1529c6c82747ccd231b6e56b959f6c5461979e1 +SHA512 (urlscan-0.8.7.tar.gz) = 8d9ae967a73a6caf2b7954a160babc43dc2247bd1a61474b3b3c3650497362514309a6f3ecc123b1f9dbd7c709e73a0422a74c14a9a4b626aa927f7adcb5fb1a diff --git a/urlscan-remove-doc.patch b/urlscan-remove-doc.patch new file mode 100644 index 0000000..653d188 --- /dev/null +++ b/urlscan-remove-doc.patch @@ -0,0 +1,12 @@ +--- urlscan-0.8.7/setup.py.orig 2018-03-03 00:13:10.157824320 +0100 ++++ urlscan-0.8.7/setup.py 2018-03-03 00:14:14.868642505 +0100 +@@ -12,8 +12,7 @@ + packages=['urlscan'], + scripts=['bin/urlscan'], + package_data={'urlscan': ['assets/*']}, +- data_files=[('share/doc/urlscan', ['README.rst', 'COPYING']), +- ('share/man/man1', ['urlscan.1'])], ++ data_files=[('share/man/man1', ['urlscan.1'])], + license="GPLv2", + install_requires=["urwid>=1.2.1"] + ) diff --git a/urlscan.spec b/urlscan.spec index 741f4fa..ea824a6 100644 --- a/urlscan.spec +++ b/urlscan.spec @@ -1,21 +1,18 @@ -%global forgeurl https://github.com/firecat53/urlscan - Name: urlscan -Version: 1.1.2 -Release: %autorelease +Version: 0.8.7 +Release: 1%{?dist} Summary: Extract and browse the URLs contained in an email (urlview replacement) -%global tag %{version} -%forgemeta - -License: GPL-2.0-or-later -URL: %{forgeurl} -Source0: %{forgesource} +License: GPLv2+ +URL: https://github.com/firecat53/%{name} +Source0: https://github.com/firecat53/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Source1: muttrc +Patch0: %{name}-remove-doc.patch BuildArch: noarch BuildRequires: python3-devel -BuildRequires: git-core +BuildRequires: python3-setuptools +Requires: python3-urwid >= 1.2.1 %description @@ -24,39 +21,35 @@ the current terminal. It is primarily meant as a replacement for urlview. %prep -%forgeautosetup -S git +%autosetup -p1 cp -p %{SOURCE1} . -# stop installing LICENSE file in docdir -sed -i '/^LICENSE/ d' pyproject.toml - -# remove shebang -sed -i '/\/usr\/bin\/env.*python/ d' urlscan/__main__.py - -%generate_buildrequires -export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}' -%pyproject_buildrequires - %build -export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}' -%pyproject_wheel +%py3_build %install -export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}' -%pyproject_install -%pyproject_save_files urlscan - -# remove extra file -rm -fr %{buildroot}/%{_docdir}/%{name}/ +%py3_install -%files -f %{pyproject_files} -%doc muttrc README.md +%files +%license COPYING +%doc muttrc README.rst %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* +%{python3_sitelib}/* %changelog -%autochangelog +* Fri Mar 02 2018 Filip Szymański - 0.8.7-1 +- Update to 0.8.7 + +* Fri Feb 09 2018 Fedora Release Engineering - 0.8.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Dec 22 2017 Filip Szymański - 0.8.6-2 +- Copy muttrc file in %%prep section + +* Thu Dec 21 2017 Filip Szymański - 0.8.6-1 +- Initial release