Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

- Resolves: rhbz#2448522

Upstream tag: v2.3.4
Upstream commit: 06c8790e

Commit authored by Packit automation (https://packit.dev/)

.gitignore

@@ -1 +1,12 @@
 /vit-1.2.tar.gz
+/vit-1.3.tar.gz
+/vit-2.0.0b1.tar.gz
+/vit-2.0.0b2.tar.gz
+/vit-2.0.0.tar.gz
+/vit-7200949.tar.gz
+/vit-2.2.0.tar.gz
+/vit-2.3.0.tar.gz
+/vit-2.3.1.tar.gz
+/vit-2.3.2.tar.gz
+/vit-2.3.3.tar.gz
+/vit-2.3.4.tar.gz

.packit.yaml

@@ -0,0 +1,13 @@
+upstream_project_url: https://github.com/scottkosty/vit
+copy_upstream_release_description: false
+upstream_tag_template: v{version}
+
+jobs:
+  - job: pull_from_upstream
+    trigger: release
+    dist_git_branches:
+      - fedora-rawhide
+  - job: koji_build
+    trigger: commit
+    dist_git_branches:
+      - fedora-all

README.packit

@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 1.15.1.post1.dev4+g9380a86a0.

UPGRADE.md

@@ -0,0 +1,31 @@
+This file contains information relevant to upgrading VIT from one version to another. Breaking changes between major versions, and significant changes between release versions will be addressed.
+
+*Note: for upgrade issues prior to VIT 1.3, please see the [legacy changelog](https://github.com/scottkosty/vit/blob/1.3/CHANGES)*.
+
+# v2.0.0
+
+Complete ground up rewrite in Python, feature-complete with VIT 1.x.
+
+### New features:
+
+ * Advanced tab completion
+ * Per-column colorization with markers *(see [COLOR.md](COLOR.md))*
+ * Intelligent sub-project indenting
+ * Multiple/customizable themes *(see [CUSTOMIZE.md](CUSTOMIZE.md))*
+ * Override/customize column formatters *(see [CUSTOMIZE.md](CUSTOMIZE.md))*
+ * Fully-customizable key bindings *(see [CUSTOMIZE.md](CUSTOMIZE.md))*
+ * Table-row striping
+ * Show version/context/report execution time in status area
+ * Customizable config dir *(see [CUSTOMIZE.md](CUSTOMIZE.md))*
+ * Comand line bash completion wrapper *(see [INSTALL.md](INSTALL.md))*
+ * Context support
+
+ This release also changes the software license from GPL to MIT.
+
+### Breaking changes:
+
+ * Configuration has been moved from ```${HOME}/.vitrc``` to ```${HOME}/.vit/config.ini``` -- the location of the config directory can be customized, see [CUSTOMIZE.md](CUSTOMIZE.md) for details.
+ * The format of the configuration file has changed, customizations in the legacy ```.vitrc``` file will need to be manually ported to the new format. The [config.sample.ini](https://github.com/scottkosty/vit/blob/2.x/vit/config/config.sample.ini) file is *heavily* commented, and should contain reference to everything you need to migrate the legacy configuration. If no ```config.ini``` exists in the VIT configuration directory, VIT will offer the option to install the sample config upon startup -- this is the easiest way to get started with porting and customization.
+ * The method of denotating tasks has changed. It is now mapped to the ```ACTION_TASK_DENOTATE``` core action, which in the default keybindings is triggered by ```<Shift>e``` when the task is highlighted.
+ * VIT 1.3 supports Taskd sync via the ```s``` keybinding, which was undocumented. VIT 2.x properly documents this functionality, and moves it to the keybinding ```<Shift>s``` by default.
+ * The ```burndown``` configuration option and display has been removed -- it may be added again in a future release or via plugin functionality.

changelog

@@ -0,0 +1,113 @@
+* Wed Jul 27 2022 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.2.0-1
+- Update to latest release
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-13.20200430git7200949
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.0.0-12.20200430git7200949
+- Rebuilt for Python 3.11
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-11.20200430git7200949
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-10.20200430git7200949
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.0.0-9.20200430git7200949
+- Rebuilt for Python 3.10
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-8.20200430git7200949
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-7.20200430git7200949
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.0.0-6.20200430git7200949
+- Rebuilt for Python 3.9
+
+* Thu Apr 30 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.0-5.20200430git7200949
+- Update to latest upstream snapshot
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Oct 07 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.0-3
+- Include upgrade from github repo---not included in pypi tarball
+
+* Mon Oct 07 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.0-2
+- Update license
+- Add UPGRADE.md
+
+* Mon Oct 07 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.0-1
+- Update to 2.0.0
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.0-0.8.0b2
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.0-0.7.0b2
+- Rebuilt for Python 3.8
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.0-0.6.0b2
+- Rebuilt for Python 3.8
+
+* Mon Aug 19 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0-0.5.0b2
+- Update to beta 2
+- Drop patch, merged upstream
+- Remove requirements file, now included in pypi tar
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.0-0.4.0b1
+- Rebuilt for Python 3.8
+
+* Sun Aug 04 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0-0.3.0b1
+- Fix bash completion
+
+* Sun Aug 04 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0-0.2.0b1
+- Add patch to fix import bug
+- Correct tests
+
+* Sun Aug 04 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0-0.1.0b1
+- Update to new version
+- Moved to Python
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-0.3.beta1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-0.2.beta1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Aug 28 2018 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.3-0.1.beta1
+- Update to 1.3.beta1
+- Remove unneeded patches
+- Use github tarball
+- Use make_build
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 17 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 1.2-4
+- Add BR: perl(Time::HiRes) (FT24FTBFS, RHBZ#1308231).
+- Add %%license.
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Jul 11 2014 Ankur Sinha <ankursinha AT fedoraproject DOT org> 1.2-1
+- Update as per reviewer comments - rhbz1112072
+
+* Tue Jun 24 2014 Ankur Sinha <ankursinha AT fedoraproject DOT org> 1.2-1
+- Update to new 1.2 stable version
+
+* Mon Jun 23 2014 Ankur Sinha <ankursinha AT fedoraproject DOT org> 1.2-0.1.beta1
+- Initial rpmbuild

sources

@@ -1 +1 @@
-9c97b6518e8942daccafe84778567fcf  vit-1.2.tar.gz
+SHA512 (vit-2.3.4.tar.gz) = 76682a39dad16f2921f16066d1ab0e4f7253b545a78bf357716895e1118f8dfba8dfad7d125f33f952f754238afe3fee54f76375d18e80a6b9b8e7c0fba05325

vit-1.2-Makefile.patch

@@ -1,25 +0,0 @@
---- Makefile.in.orig	2014-06-24 13:49:33.373879905 +1000
-+++ Makefile.in	2014-06-24 13:58:42.477358148 +1000
-@@ -28,14 +28,14 @@
- 	chmod 755 vit
- 
- install:
--	sudo mkdir -p @prefix@/bin
--	sudo cp vit @prefix@/bin/vit
--	sudo mkdir -p @prefix@/man/man1
--	sudo cp vit.1 @prefix@/man/man1/
--	sudo mkdir -p @prefix@/man/man5
--	sudo cp vitrc.5 @prefix@/man/man5/
--	sudo mkdir -p @prefix@/etc/
--	sudo cp commands @prefix@/etc/vit-commands
-+	mkdir -p $(DESTDIR)/@prefix@/bin
-+	cp vit $(DESTDIR)/@prefix@/bin/vit
-+	mkdir -p $(DESTDIR)/@prefix@/share/man/man1
-+	cp vit.1 $(DESTDIR)/@prefix@/share/man/man1/
-+	mkdir -p $(DESTDIR)/@prefix@/share/man/man5
-+	cp vitrc.5 $(DESTDIR)/@prefix@/share/man/man5/
-+	mkdir -p $(DESTDIR)/etc/
-+	cp commands $(DESTDIR)/etc/vit-commands
- 
- autoconf:
- 	@make -f .makefile autoconf

vit-1.2-manpage5.patch

@@ -1,11 +0,0 @@
---- vitrc.5.orig	2014-06-24 13:52:51.998272951 +1000
-+++ vitrc.5	2014-06-24 13:53:33.822937834 +1000
-@@ -58,7 +58,7 @@
- ID of the task that is currently selected in VIT.
- 
- .TP
--.B map c=:! task %TASKID rc.defaultwidth:200 | grep -o -P -m 1 "(ftp|http)s?://\S*" | tr -d '\n' | xsel -b<Return>
-+.B map c=:! task %TASKID rc.defaultwidth:200 | grep -o -P -m 1 "(ftp|http)s?://\\\\S*" | tr -d '\n' | xsel -b<Return>
- Copies the first link it finds to the clipboard.
- 
- .TP

vit.spec

@@ -1,80 +1,95 @@
 Name:           vit
-Version:        1.2
-Release:        4%{?dist}
-Summary:        A minimalist Taskwarrior full-screen terminal interface with Vim key bindings 
+%global forgeurl https://github.com/scottkosty/%{name}
+Version:        2.3.4
+Release:        %autorelease
+Summary:        Visual Interactive Taskwarrior full-screen terminal interface
 
+%forgemeta
 
-License:        GPLv3+
-URL:            http://taskwarrior.org
-Source0:        http://taskwarrior.org/download/%{name}-%{version}.tar.gz
-
-# Fix up makefile.in 
-# https://bug.tasktools.org/browse/VT-96
-Patch0:         vit-1.2-Makefile.patch
-
-# Fix the man page
-# https://bug.tasktools.org/browse/VT-97
-Patch1:         vit-1.2-manpage5.patch
+# spdx
+License:        MIT
+URL:            %forgeurl
+Source0:        %forgesource
 
 BuildArch:      noarch
-BuildRequires:  task
-BuildRequires:  perl(Curses)
-BuildRequires:  perl(Time::HiRes)
-Requires:       task
+BuildRequires:  python3-devel
+BuildRequires:  help2man
+
+# use the newest task release
+BuildRequires:  (task >= 3 or task2)
+# either of these will do, depends on the user
+Requires:       (task >= 3 or task2)
+
+%{?python_provide:%python_provide python3-vit}
 
 %description
 Features:
-* Vim key bindings
-* uncluttered display
-* no mouse
-* speed
+- Fully-customizable key bindings (default Vim-like)
+- Uncluttered display
+- No mouse
+- Speed
+- Per-column colorization
+- Advanced tab completion
+- Multiple/customizable themes
+- Override/customize column formatters
+- Intelligent sub-project indenting
 
 
 %prep
-%setup -q
-%patch0
-%patch1
+%forgesetup
+rm -rf vit.egg-info
 
-# Make it look at /etc/, not /prefix/etc/
-sed -i-backup "14 s:%prefix%::" vit.pl
+# Comment out to remove /usr/bin/env shebangs
+# Can use something similar to correct/remove /usr/bin/python shebangs also
+find vit/ -type f -name "*.py" -exec sed -i '/^#![  ]*\/usr\/bin\/env.*$/ d' {} 2>/dev/null ';'
+
+%generate_buildrequires
+%pyproject_buildrequires
 
 %build
-%configure
-make %{?_smp_mflags}
-
+%pyproject_wheel
 
 %install
-%make_install
+%pyproject_install
+%pyproject_save_files vit
 
+# Install bashcompletion
+install -m 0644 -p -D -T scripts/bash/%{name}.bash_completion $RPM_BUILD_ROOT/%{bash_completions_dir}/vit
 
-%files
-%doc AUTHORS CHANGES README TODO
-%license LICENSE
+# generate man pages
+for binary in "vit"
+do
+    echo "Generating man page for ${binary// /-/}"
+    PYTHONPATH="$PYTHONPATH:%{buildroot}/%{python3_sitelib}/" PATH="$PATH:%{buildroot}/%{_bindir}/" help2man --no-info --no-discard-stderr --name="${binary}" --version-string="${binary} %{version}" --output="${binary// /-}.1" "${binary}"
+    cat "${binary// /-}.1"
+    install -t '%{buildroot}%{_mandir}/man1' -p -m 0644 -D "${binary// /-}.1"
+done
+%check
+LC_ALL=C PYTHONPATH=. %{__python3} -m unittest
+
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/Directory_Replacement/
+%pretrans -p <lua>
+
+path = "%{bash_completions_dir}/vit"
+st = posix.stat(path)
+if st and st.type == "directory" then
+  status = os.rename(path, path .. ".rpmmoved")
+  if not status then
+    suffix = 0
+    while not status do
+      suffix = suffix + 1
+      status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
+    end
+    os.rename(path, path .. ".rpmmoved")
+  end
+end
+
+%files -f %{pyproject_files}
+%doc README.md CUSTOMIZE.md COLOR.md DEVELOPMENT.md UPGRADE.md
 %{_bindir}/%{name}
-%config(noreplace)%{_sysconfdir}/%{name}-commands
-%{_mandir}/man1/%{name}*
-%{_mandir}/man5/%{name}*
-
+%{bash_completions_dir}/%{name}
+%{_mandir}/man1/vit*
+%ghost %{bash_completions_dir}/%{name}.rpmmoved
 
 %changelog
-* Wed Feb 17 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 1.2-4
-- Add BR: perl(Time::HiRes) (FT24FTBFS, RHBZ#1308231).
-- Add %%license.
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Jul 11 2014 Ankur Sinha <ankursinha AT fedoraproject DOT org> 1.2-1
-- Update as per reviewer comments - rhbz1112072
-
-* Tue Jun 24 2014 Ankur Sinha <ankursinha AT fedoraproject DOT org> 1.2-1
-- Update to new 1.2 stable version
-
-* Mon Jun 23 2014 Ankur Sinha <ankursinha AT fedoraproject DOT org> 1.2-0.1.beta1
-- Initial rpmbuild
-
-* Mon Jun 23 2014 Ankur Sinha <sanjay.ankur@gmail.com>
-- 
+%autochangelog