diff --git a/.gitignore b/.gitignore index 79c397e..2786763 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,22 @@ task-1.9.2.tar.gz /task-1.9.3.tar.gz +/task-1.9.4.tar.gz +/task-2.0.0.beta4.tar.gz +/task-2.0.0.RC1.tar.gz +/task-2.0.0.tar.gz +/task-2.1.2.tar.gz +/task-2.2.0.tar.gz +/task-2.3.0.beta2.tar.gz +/task-2.3.0.tar.gz +/task-2.4.1.tar.gz +/task-2.4.2.tar.gz +/task-2.5.0.beta1.tar.gz +/task-2.5.0.beta2.tar.gz +/task-2.5.0.beta3.tar.gz +/task-2.5.0.tar.gz +/task-2.5.1.beta1.tar.gz +/task-2.5.1.tar.gz +/task-2.5.3.tar.gz +/task-2.6.2.tar.gz +/task-3.4.1.tar.gz +/task-3.4.1-vendored.tar.xz diff --git a/changelog b/changelog new file mode 100644 index 0000000..8134275 --- /dev/null +++ b/changelog @@ -0,0 +1,230 @@ +* Tue Nov 15 2022 Ankur Sinha - 2.6.2-2 +- Remove uneeded patch +- remove ninja + +* Fri Sep 30 2022 Rodolfo Olivieri - 2.6.2-1 +- Update to 2.6.2, latest upstream version. + +* Sat Jul 23 2022 Fedora Release Engineering - 2.5.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.5.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jun 03 2021 Tomas Babej - 2.5.3-1 +- Update to 2.5.3, latest upstream version. + +* Wed Jan 27 2021 Fedora Release Engineering - 2.5.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2.5.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 2.5.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.5.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 2.5.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Nov 28 2018 Igor Gnatenko - 2.5.1-10 +- Fixup rcdir path + +* Fri Aug 17 2018 Jeff Peeler - 2.5.1-9 +- Add command completion for fish shell + +* Sat Jul 14 2018 Fedora Release Engineering - 2.5.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 2.5.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 2.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon May 15 2017 Fedora Release Engineering - 2.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Aug 10 2016 Igor Gnatenko - 2.5.1-2 +- Modernize spec + +* Wed Feb 24 2016 Ralph Bean - 2.5.1-1 +- Latest upstream. + +* Mon Feb 15 2016 Ralph Bean - 2.5.1-0.1.beta1 +- A beta prerelease from upstream. + +* Fri Feb 05 2016 Fedora Release Engineering - 2.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Oct 21 2015 Ralph Bean - 2.5.0-1 +- Latest upstream. + +* Sun Oct 18 2015 Ralph Bean - 2.5.0-0.1.beta3 +- Another beta pre-release from upstream. + +* Wed Sep 16 2015 Ralph Bean - 2.5.0-0.1.beta2 +- Another beta pre-release from upstream. + +* Tue Sep 15 2015 Ralph Bean - 2.5.0-0.1.beta1 +- Latest beta pre-release from upstream. + +* Tue Sep 15 2015 Ralph Bean - 2.4.2-4 +- Update summary and description with the latest from upstream's website. + Include the keyword "taskwarrior" for rhbz#1262659. + +* Fri Jun 19 2015 Fedora Release Engineering - 2.4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 2.4.2-2 +- Rebuilt for GCC 5 C++11 ABI change + +* Tue Mar 17 2015 Ralph Bean - 2.4.2-1 +- new version + +* Mon Feb 23 2015 Ralph Bean - 2.4.1-2 +- Move bash completions, again. See: + https://bugzilla.redhat.com/show_bug.cgi?id=1190545#c7 + +* Sun Feb 15 2015 Ralph Bean - 2.4.1-1 +- Latest upstream. +- Removed obsoleted task-faq and task-tutorial man pages. +- Use CMAKE_BUILD_TYPE=release for a faster binary (at upstream's request). + +* Mon Feb 09 2015 Ralph Bean - 2.3.0-3 +- Move shell completion pieces to the right place. + +* Mon Aug 18 2014 Fedora Release Engineering - 2.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Jul 28 2014 Greg Bailey - 2.3.0-1 +- task 2.3.0 +- Fix bogus date RPM warnings in changelog +- Use cmake28 for EPEL6 builds + +* Sun Jun 08 2014 Fedora Release Engineering - 2.3.0-0.3.beta2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Jan 13 2014 Ralph Bean - 2.3.0-0.2.beta2 +- Add buildrequires on gnutls-devel so that 'task sync' will fly. + +* Mon Nov 11 2013 Ralph Bean - 2.3.0-0.1.beta2 +- Beta2 release from upstream. + +* Sun Aug 04 2013 Fedora Release Engineering - 2.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Petr Pisar - 2.2.0-2 +- Perl 5.18 rebuild + +* Sat Jun 22 2013 Luke Macken - 2.2.0-1 +- Update to task 2.2.0 + +* Thu Feb 21 2013 Luke Macken - 2.1.2-2 +- Build against libuuid instead of using their internal + implementation (#799664) + +* Thu Feb 21 2013 Luke Macken - 2.1.2-1 +- Update to task 2.1.2 + +* Fri Feb 15 2013 Fedora Release Engineering - 2.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Mar 27 2012 Federico Hernandez 2.0.0-1 + Initial RPM for task release 2.0.0 + +* Mon Mar 5 2012 Tom Callaway 2.0.0-0.2.RC1 +- update to 2.0.0 RC1 + +* Mon Feb 20 2012 Luke Macken - 2.0.0-0.1.beta4 +- Update to the latest 2.0 beta +- Build with cmake +- Add task-unistd.patch to get it building + +* Sat Jan 14 2012 Fedora Release Engineering - 1.9.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Mar 04 2011 Federico Hernandez - 1.9.4-1 + Intial RPM for task release 1.9.4 + +* Mon Nov 08 2010 Federico Hernandez - 1.9.3-1 + Intial RPM for task release 1.9.3 + +* Thu Jul 15 2010 Federico Hernandez - 1.9.2-2 + Wrong build config (Bugzilla 615034) + +* Wed Jul 14 2010 Federico Hernandez - 1.9.2-1 + Intial RPM for task release 1.9.2 + +* Sat May 22 2010 Federico Hernandez - 1.9.1-1 + Intial RPM for task release 1.9.1 + +* Mon Feb 22 2010 Federico Hernandez - 1.9.0-1 + Intial RPM for task release 1.9.0 + +* Mon Feb 15 2010 Federico Hernandez - 1.9.0.beta3-1 + Intial RPM for task beta release 1.9.0.beta3 + +* Mon Feb 08 2010 Federico Hernandez - 1.9.0.beta2-1 + Intial RPM for task beta release 1.9.0.beta2 + +* Wed Feb 03 2010 Federico Hernandez - 1.9.0.beta1-1 + Intial RPM for task beta release 1.9.0.beta1 + +* Sat Dec 05 2009 Federico Hernandez - 1.8.5-2 + Fixed wrong ChangeLog file + +* Sat Dec 05 2009 Federico Hernandez - 1.8.5-1 + Intial RPM for task bugfix release 1.8.5 + +* Tue Nov 17 2009 Federico Hernandez - 1.8.4-1 + Intial RPM for task bugfix release 1.8.4 + +* Wed Oct 21 2009 Federico Hernandez - 1.8.3-1 + Intial RPM for task bugfix release 1.8.3 +o +* Mon Sep 07 2009 Federico Hernandez - 1.8.2-1 + Intial RPM for task bugfix release 1.8.2 + +* Thu Aug 20 2009 Federico Hernandez - 1.8.1-1 + Intial RPM for task bugfix release 1.8.1 + +* Tue Jul 21 2009 Federico Hernandez - 1.8.0-1 + Intial RPM for task release 1.8.0 + +* Mon Jul 13 2009 Federico Hernandez - 1.8.0.beta3-1 + Intial RPM for task beta release 1.8.0.beta3 + +* Wed Jul 08 2009 Federico Hernandez - 1.8.0.beta2-1 + Intial RPM for task beta release 1.8.0.beta2 + +* Tue Jul 07 2009 Federico Hernandez - 1.8.0.beta1-1 + Intial RPM for task beta release 1.8.0.beta1 + +* Mon Jun 08 2009 Federico Hernandez - 1.7.1-2 + Fixed inclusion of manpages. + +* Mon Jun 08 2009 Federico Hernandez - 1.7.1-1 + Initial RPM for bugfix release 1.7.1. + Updated references to new project homepage in spec file. + +* Tue May 19 2009 Federico Hernandez - 1.7.0-2 + Changed license to GPLv2+ and removed Requires macro. + See https://bugzilla.redhat.com/show_bug.cgi?id=501498 + +* Tue May 19 2009 Federico Hernandez - 1.7.0-1 + Initial RPM. diff --git a/create-vendored-tarball.sh b/create-vendored-tarball.sh new file mode 100755 index 0000000..d981ad5 --- /dev/null +++ b/create-vendored-tarball.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +# Copyright 2025 Ankur Sinha +# Author: Ankur Sinha +# File : create-vendored-tarball.sh + +if [ 1 -ne $# ] +then + echo "One argument required: version" + exit -1 +fi + + +VERSION="$1" +PACKAGE="task" + +echo "Creating vendored tarball for ${PACKAGE} version ${VERSION}" + +tar -xvf "${PACKAGE}-${VERSION}.tar.gz" +pushd "${PACKAGE}-${VERSION}" + cargo vendor --versioned-dirs + tar -Jcvf ../"${PACKAGE}-${VERSION}-vendored.tar.xz" vendor/ +popd + +echo "Vendored tarball created" +echo "Please remember to upload this using 'fedpkg sources' also" diff --git a/sources b/sources index 18e1304..4fc4906 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -1eb9cf957a3abf60e148208e587909c2 task-1.9.3.tar.gz +SHA512 (task-3.4.1.tar.gz) = 5a6479e2afcd5142e88349b792e00fcab4d54f6762db5be00221685a93baa3332a4a410b82f66679c15eff58a43be0e175cea440b2d7befbf4e9b723a695a869 +SHA512 (task-3.4.1-vendored.tar.xz) = 7e64f2b2523441a2a5ae9177fa6d9dc235f1d8bbb5f9706b6c79f674c6aa269b956949ab4266bd3205bd3dc8fefb604b5c2d61e82b2de20c7b15cd1f0ee92589 diff --git a/task.spec b/task.spec index 2ae3860..ab7224a 100644 --- a/task.spec +++ b/task.spec @@ -1,103 +1,155 @@ +%global forgeurl https://github.com/GothenburgBitFactory/taskwarrior + Name: task -Version: 1.9.3 -Release: 2%{?dist} -Summary: A command-line to do list manager +Version: 3.4.1 +Release: %autorelease +Summary: Taskwarrior - a command-line TODO list manager -Group: Applications/Productivity -License: GPLv2+ -URL: http://taskwarrior.org -Source0: http://taskwarrior.org/download/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# (Apache-2.0 OR MIT) AND BSD-3-Clause +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 AND ISC +# Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR ISC OR MIT +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause OR Apache-2.0 OR MIT +# BSD-3-Clause +# ISC +# ISC AND (Apache-2.0 OR ISC) +# ISC AND (Apache-2.0 OR ISC) AND OpenSSL +# MIT +# MIT OR Apache-2.0 +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unicode-3.0 +# Unlicense OR MIT +# Zlib -BuildRequires: ncurses-devel +License: %{shrink: + MIT AND + (Apache-2.0 OR MIT) AND BSD-3-Clause AND + (0BSD OR MIT OR Apache-2.0) AND + Apache-2.0 AND + Apache-2.0 AND ISC AND + (Apache-2.0 OR BSL-1.0) AND + (Apache-2.0 OR ISC OR MIT) AND + (Apache-2.0 OR MIT) AND + (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND + (BSD-2-Clause OR Apache-2.0 OR MIT) AND + BSD-3-Clause AND + ISC AND + ISC AND (Apache-2.0 OR ISC) AND + ISC AND (Apache-2.0 OR ISC) AND OpenSSL AND + MIT AND + (MIT OR Apache-2.0) AND + (MIT OR Zlib OR Apache-2.0) AND + MPL-2.0 AND + Unicode-3.0 AND + (Unlicense OR MIT) AND + Zlib +} +URL: https://taskwarrior.org +# use manually released tar because it includes the sub-module +Source0: https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v%{version}/%{name}-%{version}.tar.gz +# generated with script below +Source1: %{name}-%{version}-vendored.tar.xz +# To create a tarball with all crates vendored (like https://src.fedoraproject.org/rpms/loupe/blob/rawhide/f/loupe.spec) +Source2: create-vendored-tarball.sh + +# ix86: leaf removal +# does not build on s390x and ppc64 +ExcludeArch: %{ix86} s390x %{power64} + +BuildRequires: cmake +BuildRequires: corrosion +BuildRequires: gcc-c++ + +BuildRequires: libuuid-devel + +BuildRequires: cargo-rpm-macros >= 24 %description -Task is a command-line to do list manager. It has -support for GTD functionality and includes the -following features: tags, colorful tabular output, -reports and graphs, lots of manipulation commands, -low-level API, abbreviations for all commands and -options, multi-user file locking, recurring tasks. +Taskwarrior is a command-line TODO list manager. It is flexible, fast, +efficient, unobtrusive, does its job then gets out of your way. + +Taskwarrior scales to fit your workflow. Use it as a simple app that captures +tasks, shows you the list, and removes tasks from that list. Leverage its +capabilities though, and it becomes a sophisticated data query tool that can +help you stay organized, and get through your work. %prep -%setup -q +%autosetup -n %{name}-%{version} -p1 -a1 +echo "Running cargo prep" +%{cargo_prep -v vendor} + +echo "Checking generated cargo.toml" +cat .cargo/config.toml + +echo "Checking directory contents" +ls -lash +ls -lash vendor/ + +# Fix perms and drop shebangs for scripts that users are meant to copy over to +# use +find scripts/ -type f -exec chmod -x {} ';' +find scripts/ -type f -exec sed -i -e '1{\@^#!.*@d}' {} ';' +sed -i -e '1{\@^#!.*@d}' doc/rc/refresh + +# exclude scripts for updating holiday data +rm -rf ./doc/rc/refresh +rm -rf ./scripts/addons %build -%configure -make %{?_smp_mflags} +# critical, doesn't work without this +export CARGO_HOME=%{_builddir}/%{name}-%{version}/.cargo +%cmake +%cmake_build -j1 +%cargo_license_summary +%{cargo_license} > LICENSE.dependencies +%cargo_vendor_manifest %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d -install -m 644 -T scripts/bash/task_completion.sh $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/task +export CARGO_HOME=%{_builddir}/%{name}-%{version}/.cargo +%cmake_install -%clean -rm -rf $RPM_BUILD_ROOT +# Move shell completion stuff to the right place +install -p -m 0755 -d $RPM_BUILD_ROOT/%{bash_completions_dir}/ +install -D -p -m 0644 $RPM_BUILD_ROOT/%{_pkgdocdir}/scripts/bash/%{name}.sh $RPM_BUILD_ROOT%{bash_completions_dir}/%{name} +install -p -m 0755 -d $RPM_BUILD_ROOT/%{fish_completions_dir}/ +install -D -p -m 0644 $RPM_BUILD_ROOT/%{_pkgdocdir}/scripts/fish/%{name}.fish $RPM_BUILD_ROOT%{fish_completions_dir}/%{name}.fish + +# move bits to expected locations: keep this similar to task2 +install -p -m 0755 -d $RPM_BUILD_ROOT/%{_datadir}/%{name} +install -p -m 0644 $RPM_BUILD_ROOT/%{_pkgdocdir}/rc/* -t $RPM_BUILD_ROOT/%{_datadir}/%{name}/ + +# clean up +rm -rfv $RPM_BUILD_ROOT/%{_pkgdocdir}/rc +rm -fv $RPM_BUILD_ROOT/%{_pkgdocdir}/INSTALL +rm -fv $RPM_BUILD_ROOT/%{_pkgdocdir}/LICENSE +rm -frv $RPM_BUILD_ROOT/%{_pkgdocdir}/scripts/{bash,fish} %files -%defattr(-,root,root,-) -%doc /usr/share/doc/task/ -%{_bindir}/task -%{_mandir}/man1/task.1.gz -%{_mandir}/man5/taskrc.5.gz -%{_mandir}/man5/task-tutorial.5.gz -%{_mandir}/man5/task-color.5.gz -%{_mandir}/man5/task-faq.5.gz -%{_mandir}/man5/task-sync.5.gz -%config(noreplace) %{_sysconfdir}/bash_completion.d - +%license LICENSE +%license LICENSE.dependencies +%license cargo-vendor.txt +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1* +%{_mandir}/man5/%{name}rc.5* +%{_mandir}/man5/%{name}-color.5* +%{_mandir}/man5/%{name}-sync.5* +%dir %{_datadir}/zsh/ +%dir %{zsh_completions_dir} +%{zsh_completions_dir}/_%{name} +%dir %{bash_completions_dir} +%{bash_completions_dir}/%{name} +%dir %{fish_completions_dir} +%{fish_completions_dir}/%{name}.fish +%{_datadir}/%{name} +%{_pkgdocdir} %changelog -* Wed Feb 09 2011 Fedora Release Engineering - 1.9.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Nov 08 2010 Federico Hernandez - 1.9.3-1 - Intial RPM for task beta release 1.9.3 -* Thu Jul 15 2010 Federico Hernandez - 1.9.2-2 - Wrong build config (Bugzilla 615034) -* Mon Jul 14 2010 Federico Hernandez - 1.9.2-1 - Intial RPM for task beta release 1.9.2 -* Mon May 22 2010 Federico Hernandez - 1.9.1-1 - Intial RPM for task beta release 1.9.1 -* Mon Feb 22 2010 Federico Hernandez - 1.9.0-1 - Intial RPM for task beta release 1.9.0 -* Mon Feb 15 2010 Federico Hernandez - 1.9.0.beta3-1 - Intial RPM for task beta release 1.9.0.beta3 -* Mon Feb 08 2010 Federico Hernandez - 1.9.0.beta2-1 - Intial RPM for task beta release 1.9.0.beta2 -* Wed Feb 03 2010 Federico Hernandez - 1.9.0.beta1-1 - Intial RPM for task beta release 1.9.0.beta1 -* Sat Dec 05 2009 Federico Hernandez - 1.8.5-2 - Fixed wrong ChangeLog file -* Sat Dec 05 2009 Federico Hernandez - 1.8.5-1 - Intial RPM for task bugfix release 1.8.5 -* Tue Nov 17 2009 Federico Hernandez - 1.8.4-1 - Intial RPM for task bugfix release 1.8.4 -* Wed Oct 21 2009 Federico Hernandez - 1.8.3-1 - Intial RPM for task bugfix release 1.8.3 -* Mon Sep 07 2009 Federico Hernandez - 1.8.2-1 - Intial RPM for task bugfix release 1.8.2 -* Thu Aug 20 2009 Federico Hernandez - 1.8.1-1 - Intial RPM for task bugfix release 1.8.1 -* Tue Jul 21 2009 Federico Hernandez - 1.8.0-1 - Intial RPM for task release 1.8.0 -* Mon Jul 13 2009 Federico Hernandez - 1.8.0.beta3-1 - Intial RPM for task beta release 1.8.0.beta3 -* Wed Jul 08 2009 Federico Hernandez - 1.8.0.beta2-1 - Intial RPM for task beta release 1.8.0.beta2 -* Tue Jul 07 2009 Federico Hernandez - 1.8.0.beta1-1 - Intial RPM for task beta release 1.8.0.beta1 -* Tue Jun 08 2009 Federico Hernandez - 1.7.1-2 - Fixed inclusion of manpages. -* Tue Jun 08 2009 Federico Hernandez - 1.7.1-1 - Initial RPM for bugfix release 1.7.1. - Updated references to new project homepage in spec file. -* Tue May 19 2009 Federico Hernandez - 1.7.0-2 - Changed license to GPLv2+ and removed Requires macro. - See https://bugzilla.redhat.com/show_bug.cgi?id=501498 -* Tue May 19 2009 Federico Hernandez - 1.7.0-1 - Initial RPM. +%autochangelog