From c06cdfefde21bafa28b9acf9012b68fbe3619872 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Mon, 20 Feb 2012 15:38:04 -0500 Subject: [PATCH 01/11] 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 02/11] 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 03/11] 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 04/11] 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 05/11] 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 06/11] - 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 07/11] - 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 08/11] 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 09/11] 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 10/11] 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 11/11] 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