From bcdfe5b444ee0e5f17b4d04ce6e3ba5455d64170 Mon Sep 17 00:00:00 2001 From: Federico Hernandez Date: Fri, 4 Mar 2011 01:33:29 +0100 Subject: [PATCH 01/77] task 1.9.4 --- sources | 2 +- task.spec | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/sources b/sources index 18e1304..ed224f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1eb9cf957a3abf60e148208e587909c2 task-1.9.3.tar.gz +0c5d9dedb1ead69590af895d16708070 task-1.9.4.tar.gz diff --git a/task.spec b/task.spec index 2ae3860..831ec28 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task -Version: 1.9.3 -Release: 2%{?dist} +Version: 1.9.4 +Release: 1%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity @@ -9,7 +9,6 @@ URL: http://taskwarrior.org Source0: http://taskwarrior.org/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel %description Task is a command-line to do list manager. It has @@ -52,19 +51,18 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Feb 09 2011 Fedora Release Engineering - 1.9.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_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 beta release 1.9.3 + Intial RPM for task 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 + Intial RPM for task release 1.9.2 * Mon May 22 2010 Federico Hernandez - 1.9.1-1 - Intial RPM for task beta release 1.9.1 + Intial RPM for task release 1.9.1 * Mon Feb 22 2010 Federico Hernandez - 1.9.0-1 - Intial RPM for task beta release 1.9.0 + 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 From 08f112206e100f2e947259c491c424b93b93ff96 Mon Sep 17 00:00:00 2001 From: Federico Hernandez Date: Fri, 4 Mar 2011 01:39:02 +0100 Subject: [PATCH 02/77] task 1.9.4 --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 79c397e..bffff60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ task-1.9.2.tar.gz /task-1.9.3.tar.gz +/task-1.9.4.tar.gz From 6ac50435f752cfbd653950699675180d9f94caf2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 00:20:54 -0600 Subject: [PATCH 03/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 831ec28..022cb38 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 1.9.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity @@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From c06cdfefde21bafa28b9acf9012b68fbe3619872 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Mon, 20 Feb 2012 15:38:04 -0500 Subject: [PATCH 04/77] Update to taskwarrior 2.0.0beta4 --- .gitignore | 1 + sources | 2 +- task.spec | 19 +++++++++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index bffff60..62e438b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ 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 diff --git a/sources b/sources index ed224f9..85f1a4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c5d9dedb1ead69590af895d16708070 task-1.9.4.tar.gz +0d545e7627b03e3c2dd567f3fca38a8e task-2.0.0.beta4.tar.gz diff --git a/task.spec b/task.spec index 022cb38..12cfdc4 100644 --- a/task.spec +++ b/task.spec @@ -1,14 +1,18 @@ +%global betaver beta4 + Name: task -Version: 1.9.4 -Release: 2%{?dist} +Version: 2.0.0 +Release: 0.1.%{betaver}%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: GPLv2+ URL: http://taskwarrior.org -Source0: http://taskwarrior.org/download/%{name}-%{version}.tar.gz +Source0: http://taskwarrior.org/download/%{name}-%{version}.%{betaver}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: cmake + %description Task is a command-line to do list manager. It has @@ -19,14 +23,13 @@ low-level API, abbreviations for all commands and options, multi-user file locking, recurring tasks. %prep -%setup -q +%setup -q -n %{name}-%{version}.%{betaver} %build -%configure +%cmake make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -51,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 20 2012 Luke Macken - 2.0.0-0.1.beta4 +- Update to the latest 2.0 beta +- Build with cmake + * Sat Jan 14 2012 Fedora Release Engineering - 1.9.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From eec40188e1ff2760b9e9d23f96d8f001589e25ef Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Mon, 20 Feb 2012 16:03:01 -0500 Subject: [PATCH 05/77] Write a patch to #include in a couple of places to get it building --- task.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/task.spec b/task.spec index 12cfdc4..5c5050e 100644 --- a/task.spec +++ b/task.spec @@ -10,6 +10,7 @@ License: GPLv2+ URL: http://taskwarrior.org Source0: http://taskwarrior.org/download/%{name}-%{version}.%{betaver}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: %{name}-unistd.patch BuildRequires: cmake @@ -24,6 +25,7 @@ options, multi-user file locking, recurring tasks. %prep %setup -q -n %{name}-%{version}.%{betaver} +%patch0 -p0 %build @@ -57,6 +59,7 @@ rm -rf $RPM_BUILD_ROOT * 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 From 8b809203b9a92f11a7694817fa56e51680b32d8d Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Mon, 20 Feb 2012 16:05:56 -0500 Subject: [PATCH 06/77] Add task-unistd.patch --- task-unistd.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 task-unistd.patch diff --git a/task-unistd.patch b/task-unistd.patch new file mode 100644 index 0000000..b9cb265 --- /dev/null +++ b/task-unistd.patch @@ -0,0 +1,22 @@ +diff -up ./src/commands/CmdEdit.cpp.orig ./src/commands/CmdEdit.cpp +--- ./src/commands/CmdEdit.cpp.orig 2012-02-20 15:47:38.384552783 -0500 ++++ ./src/commands/CmdEdit.cpp 2012-02-20 15:49:47.392239198 -0500 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -up ./src/A3.cpp.orig ./src/A3.cpp +--- ./src/A3.cpp.orig 2012-02-20 15:55:20.543750637 -0500 ++++ ./src/A3.cpp 2012-02-20 15:55:35.924842871 -0500 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include From 11212979ec244f4f24d9a144a57428039ba2f506 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 5 Mar 2012 12:14:22 -0500 Subject: [PATCH 07/77] update to 2.0.0.RC1 --- .gitignore | 1 + sources | 2 +- task.spec | 15 +++++---------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 62e438b..f4179b2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ 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 diff --git a/sources b/sources index 85f1a4b..c15fded 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0d545e7627b03e3c2dd567f3fca38a8e task-2.0.0.beta4.tar.gz +42333fa5a0ab3a6b058146182cbb7b1a task-2.0.0.RC1.tar.gz diff --git a/task.spec b/task.spec index 5c5050e..fcdfe9c 100644 --- a/task.spec +++ b/task.spec @@ -1,20 +1,16 @@ -%global betaver beta4 +%global betaver RC1 Name: task Version: 2.0.0 -Release: 0.1.%{betaver}%{?dist} +Release: 0.2.%{betaver}%{?dist} Summary: A command-line to do list manager - Group: Applications/Productivity License: GPLv2+ URL: http://taskwarrior.org Source0: http://taskwarrior.org/download/%{name}-%{version}.%{betaver}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: %{name}-unistd.patch - BuildRequires: cmake - %description Task is a command-line to do list manager. It has support for GTD functionality and includes the @@ -25,8 +21,6 @@ options, multi-user file locking, recurring tasks. %prep %setup -q -n %{name}-%{version}.%{betaver} -%patch0 -p0 - %build %cmake @@ -41,7 +35,6 @@ install -m 644 -T scripts/bash/task_completion.sh $RPM_BUILD_ROOT%{_sysconfdir}/ %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc /usr/share/doc/task/ @@ -54,8 +47,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/task-sync.5.gz %config(noreplace) %{_sysconfdir}/bash_completion.d - %changelog +* 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 From 6db701cc52e13f5deac01061daf4b5f59c8d95b0 Mon Sep 17 00:00:00 2001 From: Federico Hernandez Date: Tue, 27 Mar 2012 03:37:52 +0200 Subject: [PATCH 08/77] Initial package for task 2.0.0 --- .gitignore | 1 + sources | 2 +- task-unistd.patch | 22 ---------------------- task.spec | 15 ++++++--------- 4 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 task-unistd.patch diff --git a/.gitignore b/.gitignore index f4179b2..61ae8ad 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ task-1.9.2.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 diff --git a/sources b/sources index c15fded..3361a49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -42333fa5a0ab3a6b058146182cbb7b1a task-2.0.0.RC1.tar.gz +b850b49f8b69bb4049c07d0914a0f7af task-2.0.0.tar.gz diff --git a/task-unistd.patch b/task-unistd.patch deleted file mode 100644 index b9cb265..0000000 --- a/task-unistd.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up ./src/commands/CmdEdit.cpp.orig ./src/commands/CmdEdit.cpp ---- ./src/commands/CmdEdit.cpp.orig 2012-02-20 15:47:38.384552783 -0500 -+++ ./src/commands/CmdEdit.cpp 2012-02-20 15:49:47.392239198 -0500 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -up ./src/A3.cpp.orig ./src/A3.cpp ---- ./src/A3.cpp.orig 2012-02-20 15:55:20.543750637 -0500 -+++ ./src/A3.cpp 2012-02-20 15:55:35.924842871 -0500 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/task.spec b/task.spec index fcdfe9c..2dab85c 100644 --- a/task.spec +++ b/task.spec @@ -1,13 +1,11 @@ -%global betaver RC1 - Name: task Version: 2.0.0 -Release: 0.2.%{betaver}%{?dist} +Release: 1%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity -License: GPLv2+ +License: MIT URL: http://taskwarrior.org -Source0: http://taskwarrior.org/download/%{name}-%{version}.%{betaver}.tar.gz +Source0: http://taskwarrior.org/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -20,7 +18,7 @@ low-level API, abbreviations for all commands and options, multi-user file locking, recurring tasks. %prep -%setup -q -n %{name}-%{version}.%{betaver} +%setup -q -n %{name}-%{version} %build %cmake @@ -48,17 +46,16 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/bash_completion.d %changelog +* Mon 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 From dd4b4f50fe61cab42c2d3153af9cd95bb072fdea Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 17:49:19 -0500 Subject: [PATCH 09/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 2dab85c..6b44a9e 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT @@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/bash_completion.d %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon 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 From 633b91fe31dc67fa0dc381d886c5423e4318bc9e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 19:18:57 -0600 Subject: [PATCH 10/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 6b44a9e..ba10e07 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT @@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/bash_completion.d %changelog +* 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 From 2fdfc36b982ee523fa0fec624b57bbd6c64b1d48 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Thu, 21 Feb 2013 10:37:42 -0500 Subject: [PATCH 11/77] Update to task-2.1.2 --- task.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/task.spec b/task.spec index ba10e07..9c788e8 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task -Version: 2.0.0 -Release: 3%{?dist} +Version: 2.1.2 +Release: 1%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT @@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/bash_completion.d %changelog +* 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 From 339a590fe1451d7ec4c456d61ec8dc476d68c678 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Thu, 21 Feb 2013 10:38:02 -0500 Subject: [PATCH 12/77] The bash completion script was renamed --- task.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 9c788e8..68ae491 100644 --- a/task.spec +++ b/task.spec @@ -28,7 +28,7 @@ make %{?_smp_mflags} 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 +install -m 644 -T scripts/bash/task.sh $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/task %clean rm -rf $RPM_BUILD_ROOT From d3c52596f404b08ad8729fc04a5b718f8d3ab0d1 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Thu, 21 Feb 2013 10:39:31 -0500 Subject: [PATCH 13/77] Add task-2.1.2.tar.gz --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 61ae8ad..d3204a5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ task-1.9.2.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 diff --git a/sources b/sources index 3361a49..f45b5a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b850b49f8b69bb4049c07d0914a0f7af task-2.0.0.tar.gz +ff0c712a18a47f79787b971b8d1ff207 task-2.1.2.tar.gz From 3f4ce3c32dc52dd0b5a1a30777040c5f27efd81c Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Thu, 21 Feb 2013 11:33:10 -0500 Subject: [PATCH 14/77] Build against libuuid instead of using their internal implementation (#799664) --- task.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 68ae491..7c6b162 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT @@ -8,6 +8,7 @@ URL: http://taskwarrior.org Source0: http://taskwarrior.org/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake +BuildRequires: libuuid-devel %description Task is a command-line to do list manager. It has @@ -46,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/bash_completion.d %changelog +* 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 From 4b05f0cb01262aca2cf19283f8ddd4b6fc3e945f Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Sat, 22 Jun 2013 14:00:09 -0400 Subject: [PATCH 15/77] Update to taskwarrior 2.2.0 --- .gitignore | 1 + sources | 2 +- task.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d3204a5..6ba3d87 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ task-1.9.2.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 diff --git a/sources b/sources index f45b5a9..c8ab0ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ff0c712a18a47f79787b971b8d1ff207 task-2.1.2.tar.gz +eb5af01b51b90e01b574464a5d11d4e9 task-2.2.0.tar.gz diff --git a/task.spec b/task.spec index 7c6b162..0fef165 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task -Version: 2.1.2 -Release: 2%{?dist} +Version: 2.2.0 +Release: 1%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/bash_completion.d %changelog +* 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) From f94f2a30c432fbefdc08ae0404cfe3c7af544caa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 17 Jul 2013 21:54:51 +0200 Subject: [PATCH 16/77] Perl 5.18 rebuild --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 0fef165..7a5968c 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/bash_completion.d %changelog +* 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 From 43038c08b2d19d43128ad51c63e9f609b1919a12 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 22:21:30 -0500 Subject: [PATCH 17/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 7a5968c..077c17c 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/bash_completion.d %changelog +* 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 From 2c3912cd167d36e9873721542b897b79d64c86a0 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 11 Nov 2013 16:56:22 -0500 Subject: [PATCH 18/77] Latest beta from upstream. --- .gitignore | 1 + sources | 2 +- task.spec | 15 +++++++++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6ba3d87..1c7ff6f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ task-1.9.2.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 diff --git a/sources b/sources index c8ab0ec..1c9db5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb5af01b51b90e01b574464a5d11d4e9 task-2.2.0.tar.gz +c7f61f0dfa0c7a9e2cbbd994a958acce task-2.3.0.beta2.tar.gz diff --git a/task.spec b/task.spec index 077c17c..912bbdb 100644 --- a/task.spec +++ b/task.spec @@ -1,11 +1,13 @@ +%global prerelease .beta2 + Name: task -Version: 2.2.0 -Release: 3%{?dist} +Version: 2.3.0 +Release: 0.1%{prerelease}%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT URL: http://taskwarrior.org -Source0: http://taskwarrior.org/download/%{name}-%{version}.tar.gz +Source0: http://taskwarrior.org/download/%{name}-%{version}%{prerelease}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: libuuid-devel @@ -19,7 +21,7 @@ low-level API, abbreviations for all commands and options, multi-user file locking, recurring tasks. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}%{prerelease} %build %cmake @@ -38,7 +40,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc /usr/share/doc/task/ %{_bindir}/task +%{_bindir}/tasksh %{_mandir}/man1/task.1.gz +%{_mandir}/man1/tasksh.1.gz %{_mandir}/man5/taskrc.5.gz %{_mandir}/man5/task-tutorial.5.gz %{_mandir}/man5/task-color.5.gz @@ -47,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/bash_completion.d %changelog +* 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 From 3434427e87b9b791e52a699e8124b81fa168b887 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 13 Jan 2014 10:55:28 -0500 Subject: [PATCH 19/77] Add gnutls-devel to buildrequires. --- task.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 912bbdb..8e3fd0a 100644 --- a/task.spec +++ b/task.spec @@ -2,7 +2,7 @@ Name: task Version: 2.3.0 -Release: 0.1%{prerelease}%{?dist} +Release: 0.2%{prerelease}%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT @@ -11,6 +11,7 @@ Source0: http://taskwarrior.org/download/%{name}-%{version}%{prerelease}. BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: libuuid-devel +BuildRequires: gnutls-devel %description Task is a command-line to do list manager. It has @@ -51,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/bash_completion.d %changelog +* 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. From 5d7251fa4c587d34a0ce2b207dd913d262a93b4d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 03:09:09 -0500 Subject: [PATCH 20/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 8e3fd0a..c4c9788 100644 --- a/task.spec +++ b/task.spec @@ -2,7 +2,7 @@ Name: task Version: 2.3.0 -Release: 0.2%{prerelease}%{?dist} +Release: 0.3%{prerelease}%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/bash_completion.d %changelog +* 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. From f33af30408c14f590bd707a987324b9a95b8a14e Mon Sep 17 00:00:00 2001 From: Greg Bailey Date: Mon, 28 Jul 2014 15:50:09 -0700 Subject: [PATCH 21/77] task 2.3.0 - Fix bogus date RPM warnings in changelog - Use cmake28 for EPEL6 builds --- .gitignore | 1 + sources | 2 +- task.spec | 35 ++++++++++++++++++++++++++--------- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 1c7ff6f..9c179d0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ task-1.9.2.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 diff --git a/sources b/sources index 1c9db5e..17944e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7f61f0dfa0c7a9e2cbbd994a958acce task-2.3.0.beta2.tar.gz +2c1d2c64311855f3519ad038ebd372ac task-2.3.0.tar.gz diff --git a/task.spec b/task.spec index c4c9788..e416738 100644 --- a/task.spec +++ b/task.spec @@ -1,15 +1,22 @@ -%global prerelease .beta2 +#global prerelease .beta2 Name: task Version: 2.3.0 -Release: 0.3%{prerelease}%{?dist} +Release: 1%{?prerelease}%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT URL: http://taskwarrior.org -Source0: http://taskwarrior.org/download/%{name}-%{version}%{prerelease}.tar.gz +Source0: http://taskwarrior.org/download/%{name}-%{version}%{?prerelease}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +# Need to build with cmake28 for EPEL6 builds +%if 0%{?rhel} == 6 +BuildRequires: cmake28 +%else BuildRequires: cmake +%endif + BuildRequires: libuuid-devel BuildRequires: gnutls-devel @@ -22,10 +29,15 @@ low-level API, abbreviations for all commands and options, multi-user file locking, recurring tasks. %prep -%setup -q -n %{name}-%{version}%{prerelease} +%setup -q -n %{name}-%{version}%{?prerelease} %build +# Need to build with cmake28 for EPEL6 builds +%if 0%{?rhel} == 6 +%cmake28 +%else %cmake +%endif make %{?_smp_mflags} %install @@ -52,6 +64,11 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/bash_completion.d %changelog +* 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 @@ -83,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT * Sat Jul 21 2012 Fedora Release Engineering - 2.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Mon Mar 27 2012 Federico Hernandez 2.0.0-1 +* 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 @@ -99,9 +116,9 @@ rm -rf $RPM_BUILD_ROOT Intial RPM for task 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 +* Wed Jul 14 2010 Federico Hernandez - 1.9.2-1 Intial RPM for task release 1.9.2 -* Mon May 22 2010 Federico Hernandez - 1.9.1-1 +* 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 @@ -131,9 +148,9 @@ rm -rf $RPM_BUILD_ROOT 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 +* Mon Jun 08 2009 Federico Hernandez - 1.7.1-2 Fixed inclusion of manpages. -* Tue Jun 08 2009 Federico Hernandez - 1.7.1-1 +* 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 From 1c2d531754844a18ac4ba9f21173372abca42d41 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 04:50:59 +0000 Subject: [PATCH 22/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index e416738..9f2e355 100644 --- a/task.spec +++ b/task.spec @@ -2,7 +2,7 @@ Name: task Version: 2.3.0 -Release: 1%{?prerelease}%{?dist} +Release: 2%{?prerelease}%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/bash_completion.d %changelog +* 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 From af88f39a29f8a2bdfad3e281471d0ee0619a4f9e Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 9 Feb 2015 12:04:57 -0500 Subject: [PATCH 23/77] Move shell completion pieces to the right place --- task.spec | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/task.spec b/task.spec index 9f2e355..6f98de8 100644 --- a/task.spec +++ b/task.spec @@ -2,7 +2,7 @@ Name: task Version: 2.3.0 -Release: 2%{?prerelease}%{?dist} +Release: 3%{?prerelease}%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT @@ -43,15 +43,19 @@ make %{?_smp_mflags} %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.sh $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/task + +# Move shell completion stuff to the right place +mkdir -p $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/ +mv $RPM_BUILD_ROOT%{_datadir}/doc/task/scripts/zsh/_task $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/. +mkdir -p $RPM_BUILD_ROOT%{_datadir}/bash-completions/completions/ +install -m 644 -T scripts/bash/task.sh $RPM_BUILD_ROOT%{_datadir}/bash-completions/completions/task %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc /usr/share/doc/task/ +%doc %{_datadir}/doc/task/ %{_bindir}/task %{_bindir}/tasksh %{_mandir}/man1/task.1.gz @@ -61,9 +65,15 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/task-color.5.gz %{_mandir}/man5/task-faq.5.gz %{_mandir}/man5/task-sync.5.gz -%config(noreplace) %{_sysconfdir}/bash_completion.d + +%{_datadir}/zsh/site-functions/_task +%{_datadir}/bash-completions/completions/task + %changelog +* 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 From 49cc6b5ba7c0e5e101ce127720fd7cc5afbdcfc0 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Sun, 15 Feb 2015 11:11:13 -0500 Subject: [PATCH 24/77] Use pbeckinham\'s release flag for a faster binary. --- task.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/task.spec b/task.spec index 6f98de8..78e60d9 100644 --- a/task.spec +++ b/task.spec @@ -36,9 +36,9 @@ options, multi-user file locking, recurring tasks. %if 0%{?rhel} == 6 %cmake28 %else -%cmake +%cmake -DCMAKE_BUILD_TYPE=release %endif -make %{?_smp_mflags} +make VERBOSE=1 %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT From 39f8c43c722e2dff983a9037c0e224d614b1f935 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 16 Feb 2015 20:16:45 -0500 Subject: [PATCH 25/77] 2.4.1 --- .gitignore | 1 + sources | 2 +- task.spec | 13 +++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 9c179d0..a794660 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ task-1.9.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 diff --git a/sources b/sources index 17944e7..7d54c70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c1d2c64311855f3519ad038ebd372ac task-2.3.0.tar.gz +f250f3fb3922e4153c6ad1b1270dceb8 task-2.4.1.tar.gz diff --git a/task.spec b/task.spec index 78e60d9..34f85fe 100644 --- a/task.spec +++ b/task.spec @@ -1,8 +1,8 @@ #global prerelease .beta2 Name: task -Version: 2.3.0 -Release: 3%{?prerelease}%{?dist} +Version: 2.4.1 +Release: 1%{?prerelease}%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT @@ -57,13 +57,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc %{_datadir}/doc/task/ %{_bindir}/task -%{_bindir}/tasksh %{_mandir}/man1/task.1.gz -%{_mandir}/man1/tasksh.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 %{_datadir}/zsh/site-functions/_task @@ -71,6 +67,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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. From 18cda13c77a0fbd1f53a0b800781fc18eb110153 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 23 Feb 2015 15:34:57 -0500 Subject: [PATCH 26/77] Move bash completion bits, again. --- task.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/task.spec b/task.spec index 34f85fe..b5528c0 100644 --- a/task.spec +++ b/task.spec @@ -2,7 +2,7 @@ Name: task Version: 2.4.1 -Release: 1%{?prerelease}%{?dist} +Release: 2%{?prerelease}%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT @@ -47,8 +47,8 @@ make install DESTDIR=$RPM_BUILD_ROOT # Move shell completion stuff to the right place mkdir -p $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/ mv $RPM_BUILD_ROOT%{_datadir}/doc/task/scripts/zsh/_task $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/. -mkdir -p $RPM_BUILD_ROOT%{_datadir}/bash-completions/completions/ -install -m 644 -T scripts/bash/task.sh $RPM_BUILD_ROOT%{_datadir}/bash-completions/completions/task +mkdir -p $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/ +install -m 644 -T scripts/bash/task.sh $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/task %clean rm -rf $RPM_BUILD_ROOT @@ -63,10 +63,14 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/task-sync.5.gz %{_datadir}/zsh/site-functions/_task -%{_datadir}/bash-completions/completions/task +%{_datadir}/bash-completion/completions/task %changelog +* 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. From fa91b75c03ebe691a0eb6dda6e4a2a381e48a39a Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 17 Mar 2015 15:27:19 -0400 Subject: [PATCH 27/77] 2.4.2 --- .gitignore | 1 + sources | 2 +- task.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a794660..991c356 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ task-1.9.2.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 diff --git a/sources b/sources index 7d54c70..d522f53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f250f3fb3922e4153c6ad1b1270dceb8 task-2.4.1.tar.gz +4a56aa480dc5e17f6294acd5f8acf36c task-2.4.2.tar.gz diff --git a/task.spec b/task.spec index b5528c0..636bd52 100644 --- a/task.spec +++ b/task.spec @@ -1,8 +1,8 @@ #global prerelease .beta2 Name: task -Version: 2.4.1 -Release: 2%{?prerelease}%{?dist} +Version: 2.4.2 +Release: 1%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 72689c4acc289beb08f32aed1206eac992cc4c32 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:07:25 +0200 Subject: [PATCH 28/77] Rebuilt for GCC 5 C++11 ABI change --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 636bd52..935d9fb 100644 --- a/task.spec +++ b/task.spec @@ -2,7 +2,7 @@ Name: task Version: 2.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 01ec555dd569229e45c3516068eef6776a27244d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:31:39 +0000 Subject: [PATCH 29/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 935d9fb..b2bddac 100644 --- a/task.spec +++ b/task.spec @@ -2,7 +2,7 @@ Name: task Version: 2.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A command-line to do list manager Group: Applications/Productivity License: MIT @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 17556e3f84294381a59115b291dc8da115cd2eb0 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 15 Sep 2015 09:44:57 -0400 Subject: [PATCH 30/77] Update summary and description with the latest from upstream's website. --- task.spec | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/task.spec b/task.spec index 636bd52..d619afd 100644 --- a/task.spec +++ b/task.spec @@ -2,8 +2,8 @@ Name: task Version: 2.4.2 -Release: 1%{?dist} -Summary: A command-line to do list manager +Release: 2%{?dist} +Summary: Taskwarrior - a command-line TODO list manager Group: Applications/Productivity License: MIT URL: http://taskwarrior.org @@ -21,12 +21,13 @@ BuildRequires: libuuid-devel BuildRequires: gnutls-devel %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 -n %{name}-%{version}%{?prerelease} @@ -67,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 15 2015 Ralph Bean - 2.4.2-2 +- Update summary and description with the latest from upstream's website. + Include the keyword "taskwarrior" for rhbz#1262659. + * Tue Mar 17 2015 Ralph Bean - 2.4.2-1 - new version From 397230bf15c9ac9218bfa3653377fda12a55397d Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 15 Sep 2015 17:04:37 -0400 Subject: [PATCH 31/77] 2.5.0.beta1 --- .gitignore | 1 + sources | 2 +- task.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 991c356..1881e7d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ task-1.9.2.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 diff --git a/sources b/sources index d522f53..226cbc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a56aa480dc5e17f6294acd5f8acf36c task-2.4.2.tar.gz +08b5db146a457c55ccebd9fae48dfed3 task-2.5.0.beta1.tar.gz diff --git a/task.spec b/task.spec index a4ad212..2be2762 100644 --- a/task.spec +++ b/task.spec @@ -1,8 +1,8 @@ -#global prerelease .beta2 +%global prerelease .beta1 Name: task -Version: 2.4.2 -Release: 4%{?dist} +Version: 2.5.0 +Release: 0.1%{?prerelease}%{?dist} Summary: Taskwarrior - a command-line TODO list manager Group: Applications/Productivity License: MIT @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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. From af5175c5054b96639a55cd1f66e8e5a0ba24d95d Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 16 Sep 2015 17:33:29 -0400 Subject: [PATCH 32/77] 2.5.0.beta2. --- .gitignore | 1 + sources | 2 +- task.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1881e7d..acbe7eb 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ task-1.9.2.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 diff --git a/sources b/sources index 226cbc1..3edfc67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -08b5db146a457c55ccebd9fae48dfed3 task-2.5.0.beta1.tar.gz +4e3573c9628d1db7410bb64da0111e87 task-2.5.0.beta2.tar.gz diff --git a/task.spec b/task.spec index 2be2762..70a70e1 100644 --- a/task.spec +++ b/task.spec @@ -1,4 +1,4 @@ -%global prerelease .beta1 +%global prerelease .beta2 Name: task Version: 2.5.0 @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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. From f500b5209e28d6b269b2fda7c3decf23305fee23 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Sun, 18 Oct 2015 07:57:41 -0400 Subject: [PATCH 33/77] 2.5.0-0.1.beta3 --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 70a70e1..25d42cb 100644 --- a/task.spec +++ b/task.spec @@ -1,4 +1,4 @@ -%global prerelease .beta2 +%global prerelease .beta3 Name: task Version: 2.5.0 @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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. From 9d7b0948e34a70bf2aabad200edea3e90505ac7d Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Sun, 18 Oct 2015 08:02:50 -0400 Subject: [PATCH 34/77] Forgotten sources. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index acbe7eb..8701d7c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ task-1.9.2.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 diff --git a/sources b/sources index 3edfc67..1e4039c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e3573c9628d1db7410bb64da0111e87 task-2.5.0.beta2.tar.gz +dbff966a35b524963323f6c11f64c0a3 task-2.5.0.beta3.tar.gz From 17d187a3b6f47bf132364df28820f5f0eee811d4 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 21 Oct 2015 21:01:42 -0400 Subject: [PATCH 35/77] 2.5.0 --- .gitignore | 1 + sources | 2 +- task.spec | 11 ++++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8701d7c..a7e8468 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ task-1.9.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 diff --git a/sources b/sources index 1e4039c..46497de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dbff966a35b524963323f6c11f64c0a3 task-2.5.0.beta3.tar.gz +bca2a8a6f7727ccbcefd5e190d935910 task-2.5.0.tar.gz diff --git a/task.spec b/task.spec index 25d42cb..91421cf 100644 --- a/task.spec +++ b/task.spec @@ -1,13 +1,11 @@ -%global prerelease .beta3 - Name: task Version: 2.5.0 -Release: 0.1%{?prerelease}%{?dist} +Release: 1%{?dist} Summary: Taskwarrior - a command-line TODO list manager Group: Applications/Productivity License: MIT URL: http://taskwarrior.org -Source0: http://taskwarrior.org/download/%{name}-%{version}%{?prerelease}.tar.gz +Source0: http://taskwarrior.org/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Need to build with cmake28 for EPEL6 builds @@ -30,7 +28,7 @@ capabilities though, and it becomes a sophisticated data query tool that can help you stay organized, and get through your work. %prep -%setup -q -n %{name}-%{version}%{?prerelease} +%setup -q -n %{name}-%{version} %build # Need to build with cmake28 for EPEL6 builds @@ -68,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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. From 033379ab8c447ae4b50150c511a7f58e620dee66 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 01:18:10 +0000 Subject: [PATCH 36/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 91421cf..215cecf 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Taskwarrior - a command-line TODO list manager Group: Applications/Productivity License: MIT @@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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. From 62c5b19a178a53e2bd57c149cd04886fada68fbd Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 15 Feb 2016 14:42:06 -0500 Subject: [PATCH 37/77] Latest beta from upstream. --- .gitignore | 1 + sources | 2 +- task.spec | 13 +++++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a7e8468..7dd87a8 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ task-1.9.2.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 diff --git a/sources b/sources index 46497de..86739bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bca2a8a6f7727ccbcefd5e190d935910 task-2.5.0.tar.gz +8fa80556a60c7dd04dc77d6ba8ed5955 task-2.5.1.beta1.tar.gz diff --git a/task.spec b/task.spec index 215cecf..bc894ad 100644 --- a/task.spec +++ b/task.spec @@ -1,11 +1,13 @@ +%global prerelease .beta1 + Name: task -Version: 2.5.0 -Release: 2%{?dist} +Version: 2.5.1 +Release: 0.1%{?prerelease}%{?dist} Summary: Taskwarrior - a command-line TODO list manager Group: Applications/Productivity License: MIT URL: http://taskwarrior.org -Source0: http://taskwarrior.org/download/%{name}-%{version}.tar.gz +Source0: http://taskwarrior.org/download/%{name}-%{version}%{?prerelease}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Need to build with cmake28 for EPEL6 builds @@ -28,7 +30,7 @@ capabilities though, and it becomes a sophisticated data query tool that can help you stay organized, and get through your work. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}%{?prerelease} %build # Need to build with cmake28 for EPEL6 builds @@ -66,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 07ed36664506bafd7df037c0e7fc0e5b2dc54aef Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 24 Feb 2016 21:52:08 -0500 Subject: [PATCH 38/77] 2.5.1 --- .gitignore | 1 + sources | 2 +- task.spec | 11 ++++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7dd87a8..99fdfc3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ task-1.9.2.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 diff --git a/sources b/sources index 86739bb..cbe9569 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8fa80556a60c7dd04dc77d6ba8ed5955 task-2.5.1.beta1.tar.gz +bcd984a00d6d1eb6b40faf567419f784 task-2.5.1.tar.gz diff --git a/task.spec b/task.spec index bc894ad..393f171 100644 --- a/task.spec +++ b/task.spec @@ -1,13 +1,11 @@ -%global prerelease .beta1 - Name: task Version: 2.5.1 -Release: 0.1%{?prerelease}%{?dist} +Release: 1%{?dist} Summary: Taskwarrior - a command-line TODO list manager Group: Applications/Productivity License: MIT URL: http://taskwarrior.org -Source0: http://taskwarrior.org/download/%{name}-%{version}%{?prerelease}.tar.gz +Source0: http://taskwarrior.org/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Need to build with cmake28 for EPEL6 builds @@ -30,7 +28,7 @@ capabilities though, and it becomes a sophisticated data query tool that can help you stay organized, and get through your work. %prep -%setup -q -n %{name}-%{version}%{?prerelease} +%setup -q -n %{name}-%{version} %build # Need to build with cmake28 for EPEL6 builds @@ -68,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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. From f99a4e39a46ff9586158b33a9c0b46ffd40d9afb Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 24 Feb 2016 21:52:43 -0500 Subject: [PATCH 39/77] 0.8.0 --- .gitignore | 1 + sources | 2 +- task.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 99fdfc3..5768dbb 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ task-1.9.2.tar.gz /task-2.5.0.tar.gz /task-2.5.1.beta1.tar.gz /task-2.5.1.tar.gz +/fmn.rules-0.8.0.tar.gz diff --git a/sources b/sources index cbe9569..c3d9199 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bcd984a00d6d1eb6b40faf567419f784 task-2.5.1.tar.gz +d2c56b9e7e0a8101e4c96028c6da2c04 fmn.rules-0.8.0.tar.gz diff --git a/task.spec b/task.spec index 393f171..19a5ede 100644 --- a/task.spec +++ b/task.spec @@ -1,5 +1,5 @@ Name: task -Version: 2.5.1 +Version: 0.2.4 Release: 1%{?dist} Summary: Taskwarrior - a command-line TODO list manager Group: Applications/Productivity @@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 25 2016 Ralph Bean - 0.2.4-1 +- new version + * Wed Feb 24 2016 Ralph Bean - 2.5.1-1 - Latest upstream. From 0bf30c92bd852c5707f5629e1581eff5c167583e Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 24 Feb 2016 21:56:52 -0500 Subject: [PATCH 40/77] Revert "0.8.0" This reverts commit f99a4e39a46ff9586158b33a9c0b46ffd40d9afb. --- .gitignore | 1 - sources | 2 +- task.spec | 5 +---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5768dbb..99fdfc3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,3 @@ task-1.9.2.tar.gz /task-2.5.0.tar.gz /task-2.5.1.beta1.tar.gz /task-2.5.1.tar.gz -/fmn.rules-0.8.0.tar.gz diff --git a/sources b/sources index c3d9199..cbe9569 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d2c56b9e7e0a8101e4c96028c6da2c04 fmn.rules-0.8.0.tar.gz +bcd984a00d6d1eb6b40faf567419f784 task-2.5.1.tar.gz diff --git a/task.spec b/task.spec index 19a5ede..393f171 100644 --- a/task.spec +++ b/task.spec @@ -1,5 +1,5 @@ Name: task -Version: 0.2.4 +Version: 2.5.1 Release: 1%{?dist} Summary: Taskwarrior - a command-line TODO list manager Group: Applications/Productivity @@ -66,9 +66,6 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu Feb 25 2016 Ralph Bean - 0.2.4-1 -- new version - * Wed Feb 24 2016 Ralph Bean - 2.5.1-1 - Latest upstream. From d03c7313555b47d059a5d8fe1ecb6f1bbc1f65f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 10:02:49 +0200 Subject: [PATCH 41/77] Mandatory Perl build-requires added --- task.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/task.spec b/task.spec index 393f171..410bf79 100644 --- a/task.spec +++ b/task.spec @@ -17,6 +17,7 @@ BuildRequires: cmake BuildRequires: libuuid-devel BuildRequires: gnutls-devel +BuildRequires: perl-generators %description Taskwarrior is a command-line TODO list manager. It is flexible, fast, From 1c0f6ee3c01f82987819f27b8956a0c27476e2a9 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 10 Aug 2016 19:06:59 +0200 Subject: [PATCH 42/77] fixes Signed-off-by: Igor Gnatenko --- task.spec | 82 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 38 deletions(-) diff --git a/task.spec b/task.spec index 410bf79..41e6434 100644 --- a/task.spec +++ b/task.spec @@ -1,23 +1,17 @@ Name: task Version: 2.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Taskwarrior - a command-line TODO list manager -Group: Applications/Productivity License: MIT -URL: http://taskwarrior.org -Source0: http://taskwarrior.org/download/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: https://taskwarrior.org +Source0: %{url}/download/%{name}-%{version}.tar.gz -# Need to build with cmake28 for EPEL6 builds -%if 0%{?rhel} == 6 -BuildRequires: cmake28 -%else +BuildRequires: gcc-c++ BuildRequires: cmake -%endif +BuildRequires: make BuildRequires: libuuid-devel BuildRequires: gnutls-devel -BuildRequires: perl-generators %description Taskwarrior is a command-line TODO list manager. It is flexible, fast, @@ -29,44 +23,56 @@ capabilities though, and it becomes a sophisticated data query tool that can help you stay organized, and get through your work. %prep -%setup -q -n %{name}-%{version} +%autosetup +# Drop installation of docs and scripts +#sed -i -e "/doc/d; /scripts/d" CMakeLists.txt +mkdir %{_target_platform} %build -# Need to build with cmake28 for EPEL6 builds -%if 0%{?rhel} == 6 -%cmake28 -%else -%cmake -DCMAKE_BUILD_TYPE=release -%endif -make VERBOSE=1 %{?_smp_mflags} +pushd %{_target_platform} + %cmake .. -DTASK_RCDIR=%{_datadir}/%{name} +popd +%make_build -C %{_target_platform} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%make_install -C %{_target_platform} # Move shell completion stuff to the right place -mkdir -p $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/ -mv $RPM_BUILD_ROOT%{_datadir}/doc/task/scripts/zsh/_task $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/. -mkdir -p $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/ -install -m 644 -T scripts/bash/task.sh $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/task +mkdir -p %{buildroot}%{_datadir}/zsh/site-functions/ +install -Dpm0644 scripts/zsh/_%{name} %{buildroot}%{_datadir}/zsh/site-functions/_%{name} +mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ +install -Dpm0644 scripts/bash/%{name}.sh %{buildroot}%{_datadir}/bash-completion/completions/%{name} -%clean -rm -rf $RPM_BUILD_ROOT +# Fix perms and drop shebangs +# that's only docs and it's written in README about permissings +find scripts/ -type f -exec chmod -x {} ';' +find scripts/ -type f -exec sed -i -e '1{\@^#!.*@d}' {} ';' + +rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %files -%defattr(-,root,root,-) -%doc %{_datadir}/doc/task/ -%{_bindir}/task -%{_mandir}/man1/task.1.gz -%{_mandir}/man5/taskrc.5.gz -%{_mandir}/man5/task-color.5.gz -%{_mandir}/man5/task-sync.5.gz - -%{_datadir}/zsh/site-functions/_task -%{_datadir}/bash-completion/completions/task - +%license LICENSE +%doc NEWS doc/ref/%{name}-ref.pdf +%doc scripts/vim/ scripts/hooks/ +%{_bindir}/%{name} +# We don't want to have refresh script there +%exclude %{_datadir}/%{name}/refresh +%{_datadir}/%{name}/ +%{_mandir}/man1/%{name}.1* +%{_mandir}/man5/%{name}rc.5* +%{_mandir}/man5/%{name}-color.5* +%{_mandir}/man5/%{name}-sync.5* +%dir %{_datadir}/zsh/ +%dir %{_datadir}/zsh/site-functions/ +%{_datadir}/zsh/site-functions/_%{name} +%dir %{_datadir}/bash-completion/ +%dir %{_datadir}/bash-completion/completions/ +%{_datadir}/bash-completion/completions/%{name} %changelog +* Wed Aug 10 2016 Igor Gnatenko - 2.5.1-2 +- Modernize spec + * Wed Feb 24 2016 Ralph Bean - 2.5.1-1 - Latest upstream. From c42d57c90a436f2060a54808caf659ba38cc6ba8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 10 Aug 2016 19:11:21 +0200 Subject: [PATCH 43/77] drop redundant comment Signed-off-by: Igor Gnatenko --- task.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/task.spec b/task.spec index 41e6434..4f24c62 100644 --- a/task.spec +++ b/task.spec @@ -24,8 +24,6 @@ help you stay organized, and get through your work. %prep %autosetup -# Drop installation of docs and scripts -#sed -i -e "/doc/d; /scripts/d" CMakeLists.txt mkdir %{_target_platform} %build From 6f6626c346e4aa4d51f4ba6a2cb65538765170c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 15:35:32 +0000 Subject: [PATCH 44/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 4f24c62..cd62892 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -68,6 +68,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/bash-completion/completions/%{name} %changelog +* 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 From 2b485a82a3cba5df53491553bfc2027967966f70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 21:26:44 +0000 Subject: [PATCH 45/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index cd62892..0e3bef1 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -68,6 +68,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/bash-completion/completions/%{name} %changelog +* 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 From 24870ad8794913a8942966c55a445e71781b22c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 19:58:30 +0000 Subject: [PATCH 46/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 0e3bef1..2fb0ac1 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -68,6 +68,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/bash-completion/completions/%{name} %changelog +* 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 From a655a0db89e6bf2d7094714c5a855cc64c56c07c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 09:09:47 +0000 Subject: [PATCH 47/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 2fb0ac1..cdd8402 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.5.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -68,6 +68,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/bash-completion/completions/%{name} %changelog +* 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 From eb8f21dac8786081f3bae11a5cc9da62e6c715ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 18:30:28 +0000 Subject: [PATCH 48/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index cdd8402..77353a8 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.5.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -68,6 +68,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/bash-completion/completions/%{name} %changelog +* 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 From 3d021f41933ed6d2c708606a742530df8eb27920 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 07:17:18 +0000 Subject: [PATCH 49/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 77353a8..546a60d 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.5.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -68,6 +68,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/bash-completion/completions/%{name} %changelog +* 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 From 0426d37be323b9e2517115ac976f1d70ffdbe67b Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Mon, 20 Aug 2018 16:16:14 -0400 Subject: [PATCH 50/77] Add fish shell command completion --- task.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 546a60d..2c8a713 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.5.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -40,6 +40,8 @@ mkdir -p %{buildroot}%{_datadir}/zsh/site-functions/ install -Dpm0644 scripts/zsh/_%{name} %{buildroot}%{_datadir}/zsh/site-functions/_%{name} mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ install -Dpm0644 scripts/bash/%{name}.sh %{buildroot}%{_datadir}/bash-completion/completions/%{name} +mkdir -p %{buildroot}%{_datadir}/fish/completions/ +install -Dpm0644 scripts/fish/%{name}.fish %{buildroot}%{_datadir}/fish/completions/%{name}.fish # Fix perms and drop shebangs # that's only docs and it's written in README about permissings @@ -66,8 +68,14 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %dir %{_datadir}/bash-completion/ %dir %{_datadir}/bash-completion/completions/ %{_datadir}/bash-completion/completions/%{name} +%dir %{_datadir}/fish/ +%dir %{_datadir}/fish/completions/ +%{_datadir}/fish/completions/%{name}.fish %changelog +* 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 From 91dc8afc10d0de9f80e97c807b08604f3a5f18e1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 28 Nov 2018 11:00:53 +0100 Subject: [PATCH 51/77] fixup rcdir Signed-off-by: Igor Gnatenko --- task.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/task.spec b/task.spec index 2c8a713..4b7a084 100644 --- a/task.spec +++ b/task.spec @@ -1,14 +1,14 @@ Name: task Version: 2.5.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org Source0: %{url}/download/%{name}-%{version}.tar.gz -BuildRequires: gcc-c++ BuildRequires: cmake -BuildRequires: make +BuildRequires: gcc-c++ +BuildRequires: ninja-build BuildRequires: libuuid-devel BuildRequires: gnutls-devel @@ -24,16 +24,13 @@ help you stay organized, and get through your work. %prep %autosetup -mkdir %{_target_platform} %build -pushd %{_target_platform} - %cmake .. -DTASK_RCDIR=%{_datadir}/%{name} -popd -%make_build -C %{_target_platform} +%cmake . -B%{_vpath_builddir} -GNinja -DTASK_RCDIR=share/%{name} +%ninja_build -C %{_vpath_builddir} %install -%make_install -C %{_target_platform} +%ninja_install -C %{_vpath_builddir} # Move shell completion stuff to the right place mkdir -p %{buildroot}%{_datadir}/zsh/site-functions/ @@ -73,6 +70,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/fish/completions/%{name}.fish %changelog +* 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 From 7c18a29232aa1ca88bf81c31b2afefe2edc4d30a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 09:25:18 +0000 Subject: [PATCH 52/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 4b7a084..a0608ff 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.5.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -70,6 +70,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/fish/completions/%{name}.fish %changelog +* 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 From 6b47b796d2c278b8435bf6c4f660ec499fd2d463 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 01:00:01 +0000 Subject: [PATCH 53/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index a0608ff..6ad6252 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.5.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -70,6 +70,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/fish/completions/%{name}.fish %changelog +* 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 From 4b660f36bb237767a82edd334e48e2a829e35847 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 01:05:39 +0000 Subject: [PATCH 54/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 6ad6252..8ac5fda 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.5.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -70,6 +70,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/fish/completions/%{name}.fish %changelog +* 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 From 66b90018b3252e96e46187411d0a0480b4a97d86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 12:06:14 +0000 Subject: [PATCH 55/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 8ac5fda..282c192 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.5.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -70,6 +70,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/fish/completions/%{name}.fish %changelog +* 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 From 3d46f2082d28d56a9ab4d1e459fecb179f6e3e45 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 21:36:49 +0000 Subject: [PATCH 56/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 282c192..0e447bc 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.5.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -70,6 +70,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/fish/completions/%{name}.fish %changelog +* 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 From 79a1512a6628ed2e3adadccd9a89d3676e0eb1a4 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Thu, 3 Jun 2021 20:09:00 -0400 Subject: [PATCH 57/77] Update task to 2.5.3 --- .gitignore | 1 + sources | 2 +- task.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 99fdfc3..a9c7976 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ task-1.9.2.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 diff --git a/sources b/sources index cbe9569..f8aeeb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bcd984a00d6d1eb6b40faf567419f784 task-2.5.1.tar.gz +41fa2b61f4de729e867b185ceac0a1a8 task-2.5.3.tar.gz diff --git a/task.spec b/task.spec index 0e447bc..2b7b64f 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task -Version: 2.5.1 -Release: 15%{?dist} +Version: 2.5.3 +Release: 1%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -70,6 +70,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/fish/completions/%{name}.fish %changelog +* 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 From a65524f65fc2bff425f9d6f312f6387906897201 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Thu, 3 Jun 2021 21:30:52 -0400 Subject: [PATCH 58/77] sources: Use SHA512 instead of md5 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index f8aeeb8..41f53ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -41fa2b61f4de729e867b185ceac0a1a8 task-2.5.3.tar.gz +SHA512 (task-2.5.3.tar.gz) = e906c8f42ad4b9a7e20a82defe31b89194d72957f18dd5129ecc41a2a60a9d8b0d01abb9b44ecce79b65cd9064af4a4a4c9dd695f98152e77908f130dc3f9677 From 8603e22478c28f18e5a18e2b94f250bba166bb5c Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Thu, 3 Jun 2021 22:19:19 -0400 Subject: [PATCH 59/77] build: Add patch to make sure internal libs are built as static This is a workaround and will not be needed in future releases (after 2.5.3). --- shared-libs.patch | 36 ++++++++++++++++++++++++++++++++++++ task.spec | 1 + 2 files changed, 37 insertions(+) create mode 100644 shared-libs.patch diff --git a/shared-libs.patch b/shared-libs.patch new file mode 100644 index 0000000..0f58204 --- /dev/null +++ b/shared-libs.patch @@ -0,0 +1,36 @@ +From 3348a26bad7a3d3ac46631697c6135d654425534 Mon Sep 17 00:00:00 2001 +From: Jan Palus +Date: Fri, 29 Jan 2021 23:03:32 +0100 +Subject: [PATCH] build: make sure internal libs are built as static + +these libararies are not installed so don't leave the decision up to +enviroment which might build shared libraries resulting in binary +with missing deps after installation + +Fixes #2403 +--- + src/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 52c6a9578..efb34f1c8 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -6,7 +6,7 @@ include_directories (${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/libshared/src + ${TASK_INCLUDE_DIRS}) + +-add_library (task CLI2.cpp CLI2.h ++add_library (task STATIC CLI2.cpp CLI2.h + Context.cpp Context.h + DOM.cpp DOM.h + Eval.cpp Eval.h +@@ -28,7 +28,7 @@ add_library (task CLI2.cpp CLI2.h + sort.cpp + util.cpp util.h) + +-add_library (libshared libshared/src/Color.cpp libshared/src/Color.h ++add_library (libshared STATIC libshared/src/Color.cpp libshared/src/Color.h + libshared/src/Configuration.cpp libshared/src/Configuration.h + libshared/src/Datetime.cpp libshared/src/Datetime.h + libshared/src/Duration.cpp libshared/src/Duration.h diff --git a/task.spec b/task.spec index 2b7b64f..58921e6 100644 --- a/task.spec +++ b/task.spec @@ -5,6 +5,7 @@ Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org Source0: %{url}/download/%{name}-%{version}.tar.gz +Patch0: shared-libs.patch BuildRequires: cmake BuildRequires: gcc-c++ From a22540319ce9d35b6c81ee5c858b8b500add5d06 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Thu, 3 Jun 2021 22:53:28 -0400 Subject: [PATCH 60/77] spec: Pass -p1 flag to autosetup --- task.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 58921e6..e0a3f87 100644 --- a/task.spec +++ b/task.spec @@ -24,7 +24,7 @@ capabilities though, and it becomes a sophisticated data query tool that can help you stay organized, and get through your work. %prep -%autosetup +%autosetup -p1 %build %cmake . -B%{_vpath_builddir} -GNinja -DTASK_RCDIR=share/%{name} From 24e24a9271f542483261c033da58f98278cbd2e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 18:53:17 +0000 Subject: [PATCH 61/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index e0a3f87..0354c36 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -71,6 +71,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/fish/completions/%{name}.fish %changelog +* 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. From 69dfd66135795ad3f72050601b4f19e441a2a28b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 02:18:29 +0000 Subject: [PATCH 62/77] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 0354c36..95143b0 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.5.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -71,6 +71,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/fish/completions/%{name}.fish %changelog +* 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 From 3c719263fb27a1076af1c6e53ac3f22bd4967779 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 10:05:40 +0000 Subject: [PATCH 63/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- task.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 95143b0..b690659 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.5.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -71,6 +71,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/fish/completions/%{name}.fish %changelog +* 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 From 499f8d6803f90be852608404dfcd5916c5cfcac2 Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Fri, 30 Sep 2022 13:44:43 -0300 Subject: [PATCH 64/77] Bump task to latest upstream version Signed-off-by: Rodolfo Olivieri --- sources | 2 +- task.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 41f53ea..93c5c82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (task-2.5.3.tar.gz) = e906c8f42ad4b9a7e20a82defe31b89194d72957f18dd5129ecc41a2a60a9d8b0d01abb9b44ecce79b65cd9064af4a4a4c9dd695f98152e77908f130dc3f9677 +SHA512 (task-2.6.2.tar.gz) = 3c592552c1baada09ef4e06cf2266c9897ffae42a75998b70767f2cfbabd2e1de7d1a900f16f3b8eb164ce19637dabd21e246f84732a20a646f39716895cdf98 diff --git a/task.spec b/task.spec index b690659..8f874d0 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task -Version: 2.5.3 -Release: 4%{?dist} +Version: 2.6.2 +Release: 1%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -71,6 +71,9 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/fish/completions/%{name}.fish %changelog +* 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 From 5f9d8ca6a626eccade1b17a05e1c7425f8653693 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Tue, 15 Nov 2022 16:20:23 +0000 Subject: [PATCH 65/77] fix: fix build, remove uneeded patch --- .gitignore | 1 + shared-libs.patch | 36 ------------------------------------ task.spec | 16 +++++++++------- 3 files changed, 10 insertions(+), 43 deletions(-) delete mode 100644 shared-libs.patch diff --git a/.gitignore b/.gitignore index a9c7976..89e44a3 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ task-1.9.2.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 diff --git a/shared-libs.patch b/shared-libs.patch deleted file mode 100644 index 0f58204..0000000 --- a/shared-libs.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3348a26bad7a3d3ac46631697c6135d654425534 Mon Sep 17 00:00:00 2001 -From: Jan Palus -Date: Fri, 29 Jan 2021 23:03:32 +0100 -Subject: [PATCH] build: make sure internal libs are built as static - -these libararies are not installed so don't leave the decision up to -enviroment which might build shared libraries resulting in binary -with missing deps after installation - -Fixes #2403 ---- - src/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 52c6a9578..efb34f1c8 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -6,7 +6,7 @@ include_directories (${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/src/libshared/src - ${TASK_INCLUDE_DIRS}) - --add_library (task CLI2.cpp CLI2.h -+add_library (task STATIC CLI2.cpp CLI2.h - Context.cpp Context.h - DOM.cpp DOM.h - Eval.cpp Eval.h -@@ -28,7 +28,7 @@ add_library (task CLI2.cpp CLI2.h - sort.cpp - util.cpp util.h) - --add_library (libshared libshared/src/Color.cpp libshared/src/Color.h -+add_library (libshared STATIC libshared/src/Color.cpp libshared/src/Color.h - libshared/src/Configuration.cpp libshared/src/Configuration.h - libshared/src/Datetime.cpp libshared/src/Datetime.h - libshared/src/Duration.cpp libshared/src/Duration.h diff --git a/task.spec b/task.spec index 8f874d0..83d2d2c 100644 --- a/task.spec +++ b/task.spec @@ -1,15 +1,13 @@ Name: task Version: 2.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org Source0: %{url}/download/%{name}-%{version}.tar.gz -Patch0: shared-libs.patch BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: ninja-build BuildRequires: libuuid-devel BuildRequires: gnutls-devel @@ -24,14 +22,14 @@ capabilities though, and it becomes a sophisticated data query tool that can help you stay organized, and get through your work. %prep -%autosetup -p1 +%autosetup %build -%cmake . -B%{_vpath_builddir} -GNinja -DTASK_RCDIR=share/%{name} -%ninja_build -C %{_vpath_builddir} +%cmake -DTASK_RCDIR=share/%{name} +%cmake_build %install -%ninja_install -C %{_vpath_builddir} +%cmake_install # Move shell completion stuff to the right place mkdir -p %{buildroot}%{_datadir}/zsh/site-functions/ @@ -71,6 +69,10 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/fish/completions/%{name}.fish %changelog +* 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. From 8df72b929d7fec885394d5a1af733c80264edde9 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Tue, 15 Nov 2022 16:22:00 +0000 Subject: [PATCH 66/77] chore: use rpmautospec --- changelog | 230 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ task.spec | 207 +----------------------------------------------- 2 files changed, 232 insertions(+), 205 deletions(-) create mode 100644 changelog 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/task.spec b/task.spec index 83d2d2c..0424d7d 100644 --- a/task.spec +++ b/task.spec @@ -1,6 +1,6 @@ Name: task Version: 2.6.2 -Release: 2%{?dist} +Release: %autorelease Summary: Taskwarrior - a command-line TODO list manager License: MIT URL: https://taskwarrior.org @@ -69,207 +69,4 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %{_datadir}/fish/completions/%{name}.fish %changelog -* 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 -* 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. +%autochangelog From e4e93b6ed40f4abc4f3f070d35b0a163e2d92623 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 04:39:24 +0000 Subject: [PATCH 67/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 68e83c0be2e368d1b4644e1d551ce3a7a93db920 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 03:11:49 +0000 Subject: [PATCH 68/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From bb861659fdcfb8719c2dc356a8806b3c6510adc2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 05:23:25 +0000 Subject: [PATCH 69/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6bdaca2d0952866fb75aec38b71324849329388d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 07:04:23 +0000 Subject: [PATCH 70/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c51c1ced66da8c8af5d9d7f9907c573646ae7501 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 12:22:06 +0000 Subject: [PATCH 71/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 088a62536c0bc065ae09f13470b2d14793fd9516 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Tue, 10 Jun 2025 11:59:57 +0100 Subject: [PATCH 72/77] feat: update to 3.4.1 Use vendored rust builds, since the dependency chain is not tractable. - fixes rh#2271342 - fixes rh#2341411 --- .gitignore | 2 + create-vendored-tarball.sh | 26 +++++++++++ sources | 3 +- task.spec | 91 +++++++++++++++++++++++++++++++++----- 4 files changed, 110 insertions(+), 12 deletions(-) create mode 100755 create-vendored-tarball.sh diff --git a/.gitignore b/.gitignore index 89e44a3..2786763 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ task-1.9.2.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/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 93c5c82..4fc4906 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (task-2.6.2.tar.gz) = 3c592552c1baada09ef4e06cf2266c9897ffae42a75998b70767f2cfbabd2e1de7d1a900f16f3b8eb164ce19637dabd21e246f84732a20a646f39716895cdf98 +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 0424d7d..4422134 100644 --- a/task.spec +++ b/task.spec @@ -1,16 +1,69 @@ +%global forgeurl https://github.com/GothenburgBitFactory/taskwarrior + Name: task -Version: 2.6.2 +Version: 3.4.1 Release: %autorelease Summary: Taskwarrior - a command-line TODO list manager -License: MIT + +# (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 + +License: %{shrink: + MIT + (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 -Source0: %{url}/download/%{name}-%{version}.tar.gz +# 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 BuildRequires: cmake +BuildRequires: corrosion BuildRequires: gcc-c++ BuildRequires: libuuid-devel -BuildRequires: gnutls-devel + +BuildRequires: cargo-rpm-macros >= 24 %description Taskwarrior is a command-line TODO list manager. It is flexible, fast, @@ -22,13 +75,31 @@ capabilities though, and it becomes a sophisticated data query tool that can help you stay organized, and get through your work. %prep -%autosetup +%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/ + %build -%cmake -DTASK_RCDIR=share/%{name} -%cmake_build +# 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 +export CARGO_HOME=%{_builddir}/%{name}-%{version}/.cargo %cmake_install # Move shell completion stuff to the right place @@ -48,12 +119,10 @@ rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ %files %license LICENSE -%doc NEWS doc/ref/%{name}-ref.pdf +%license LICENSE.dependencies +%doc doc/ref/%{name}-ref.pdf %doc scripts/vim/ scripts/hooks/ %{_bindir}/%{name} -# We don't want to have refresh script there -%exclude %{_datadir}/%{name}/refresh -%{_datadir}/%{name}/ %{_mandir}/man1/%{name}.1* %{_mandir}/man5/%{name}rc.5* %{_mandir}/man5/%{name}-color.5* From 25b92dc48b0e49f4adfa66d7921e5aee2f306269 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Sun, 15 Jun 2025 15:00:17 +0100 Subject: [PATCH 73/77] feat: exclude arches that it does not build on --- task.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/task.spec b/task.spec index 4422134..16faa4a 100644 --- a/task.spec +++ b/task.spec @@ -57,6 +57,10 @@ 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++ From f5b59bd909bc5e6b5a961a07f8d4c38a518fa7bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 23 Jun 2025 05:09:29 +0000 Subject: [PATCH 74/77] Add missing operator in License tag --- task.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task.spec b/task.spec index 16faa4a..cd5cd23 100644 --- a/task.spec +++ b/task.spec @@ -27,7 +27,7 @@ Summary: Taskwarrior - a command-line TODO list manager # Zlib License: %{shrink: - MIT + MIT AND (Apache-2.0 OR MIT) AND BSD-3-Clause AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND From 12866b633ac4b7fdfa69555ae35221e1eeb8b31c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:05:38 +0000 Subject: [PATCH 75/77] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From c2b0b646917cffcf0ccc9cac93d741458255f5ad Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Tue, 29 Jul 2025 16:26:58 +0100 Subject: [PATCH 76/77] fix: re-add missing rc/script files Fixes rh#2383994 --- task.spec | 51 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/task.spec b/task.spec index cd5cd23..9653bf3 100644 --- a/task.spec +++ b/task.spec @@ -91,6 +91,15 @@ 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 # critical, doesn't work without this @@ -107,39 +116,39 @@ export CARGO_HOME=%{_builddir}/%{name}-%{version}/.cargo %cmake_install # Move shell completion stuff to the right place -mkdir -p %{buildroot}%{_datadir}/zsh/site-functions/ -install -Dpm0644 scripts/zsh/_%{name} %{buildroot}%{_datadir}/zsh/site-functions/_%{name} -mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ -install -Dpm0644 scripts/bash/%{name}.sh %{buildroot}%{_datadir}/bash-completion/completions/%{name} -mkdir -p %{buildroot}%{_datadir}/fish/completions/ -install -Dpm0644 scripts/fish/%{name}.fish %{buildroot}%{_datadir}/fish/completions/%{name}.fish +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} -# Fix perms and drop shebangs -# that's only docs and it's written in README about permissings -find scripts/ -type f -exec chmod -x {} ';' -find scripts/ -type f -exec sed -i -e '1{\@^#!.*@d}' {} ';' +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 -rm -vrf %{buildroot}%{_datadir}/doc/%{name}/ +# 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 %license LICENSE %license LICENSE.dependencies -%doc doc/ref/%{name}-ref.pdf -%doc scripts/vim/ scripts/hooks/ %{_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 %{_datadir}/zsh/site-functions/ -%{_datadir}/zsh/site-functions/_%{name} -%dir %{_datadir}/bash-completion/ -%dir %{_datadir}/bash-completion/completions/ -%{_datadir}/bash-completion/completions/%{name} -%dir %{_datadir}/fish/ -%dir %{_datadir}/fish/completions/ -%{_datadir}/fish/completions/%{name}.fish +%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 %autochangelog From aedb4020b3a724d8eb0412fa47adb37fd191dbeb Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Thu, 21 Aug 2025 12:21:15 +0100 Subject: [PATCH 77/77] fix: add cargo-vendor file Required to generate the bundled provides --- task.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/task.spec b/task.spec index 9653bf3..ab7224a 100644 --- a/task.spec +++ b/task.spec @@ -135,6 +135,7 @@ rm -frv $RPM_BUILD_ROOT/%{_pkgdocdir}/scripts/{bash,fish} %files %license LICENSE %license LICENSE.dependencies +%license cargo-vendor.txt %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %{_mandir}/man5/%{name}rc.5*