Merge branch 'f18' into f17

Conflicts:
	sources
	task.spec

.gitignore

@@ -1,3 +1,7 @@
 task-1.9.2.tar.gz
 /task-1.9.3.tar.gz
 /task-1.9.4.tar.gz
+/task-2.0.0.beta4.tar.gz
+/task-2.0.0.RC1.tar.gz
+/task-2.0.0.tar.gz
+/task-2.1.2.tar.gz

sources

@@ -1 +1 @@
-b850b49f8b69bb4049c07d0914a0f7af  task-2.0.0.tar.gz
+ff0c712a18a47f79787b971b8d1ff207  task-2.1.2.tar.gz

task.spec

@@ -1,6 +1,6 @@
 Name:           task
-Version:        2.0.0
-Release:        1%{?dist}
+Version:        2.1.2
+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
@@ -28,7 +29,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
@@ -46,6 +47,13 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/bash_completion.d
 
 %changelog
+* Thu Feb 21 2013 Luke Macken <lmacken@redhat.com> - 2.1.2-2
+- Build against libuuid instead of using their internal
+  implementation (#799664)
+
+* Thu Feb 21 2013 Luke Macken <lmacken@redhat.com> - 2.1.2-1
+- Update to task 2.1.2
+
 * Mon Mar 27 2012 Federico Hernandez <ultrafredde@gmail.com> 2.0.0-1
   Initial RPM for task release 2.0.0
 * Mon Mar  5 2012 Tom Callaway <spot@fedoraproject.org> 2.0.0-0.2.RC1