[packages/taskwarrior] up to 2.5.3

atler atler at pld-linux.org
Fri Jan 29 22:22:50 CET 2021


commit a6a041d5acd28a7f3758691f65870be920ff0e88
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Jan 29 22:19:06 2021 +0100

    up to 2.5.3

 taskwarrior-link.patch | 15 +++++++++++++++
 taskwarrior.spec       | 14 ++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)
---
diff --git a/taskwarrior.spec b/taskwarrior.spec
index 7f3dbbf..7f78df9 100644
--- a/taskwarrior.spec
+++ b/taskwarrior.spec
@@ -3,16 +3,17 @@ Summary:	Taskwarrior is a command-line to do list manager
 Summary(hu.UTF-8):	Taskwarrior egy parancssoros ToDo-kezelő
 Summary(pl.UTF-8):	Taskwarrior - konsolowy manadżer rzeczy do zrobienia
 Name:		taskwarrior
-Version:	2.5.1
-Release:	2
+Version:	2.5.3
+Release:	1
 License:	MIT
 Group:		Applications
 Source0:	http://www.taskwarrior.org/download/%{shortname}-%{version}.tar.gz
-# Source0-md5:	bcd984a00d6d1eb6b40faf567419f784
+# Source0-md5:	41fa2b61f4de729e867b185ceac0a1a8
+Patch0:		%{name}-link.patch
 URL:		http://taskwarrior.org/
-BuildRequires:	cmake >= 2.8
+BuildRequires:	cmake >= 3.0
 BuildRequires:	gnutls-devel
-BuildRequires:	libstdc++-devel
+BuildRequires:	libstdc++-devel >= 6:5
 BuildRequires:	libuuid-devel
 BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -106,6 +107,7 @@ taskwarriora.
 
 %prep
 %setup -q -n %{shortname}-%{version}
+%patch0 -p1
 
 %build
 %cmake
@@ -134,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog DEVELOPER EXPOSITION NEWS README.md doc/rc
+%doc AUTHORS ChangeLog DEVELOPER.md NEWS README.md doc/rc
 %attr(755,root,root) %{_bindir}/%{shortname}
 %{_mandir}/man1/*1*
 %{_mandir}/man5/*5*
diff --git a/taskwarrior-link.patch b/taskwarrior-link.patch
new file mode 100644
index 0000000..d02e7a4
--- /dev/null
+++ b/taskwarrior-link.patch
@@ -0,0 +1,15 @@
+--- task-2.5.3/src/CMakeLists.txt.orig	2021-01-04 06:30:22.000000000 +0100
++++ task-2.5.3/src/CMakeLists.txt	2021-01-29 22:08:29.085604445 +0100
+@@ -50,9 +50,9 @@
+ add_executable (lex_executable lex.cpp)
+ 
+ # Yes, 'task' (and hence libshared) is included twice, otherwise linking fails on assorted OSes.
+-target_link_libraries (task_executable task commands columns libshared task libshared ${TASK_LIBRARIES})
+-target_link_libraries (calc_executable task commands columns libshared task libshared ${TASK_LIBRARIES})
+-target_link_libraries (lex_executable  task commands columns libshared task libshared ${TASK_LIBRARIES})
++target_link_libraries (task_executable task commands columns libshared libshared ${TASK_LIBRARIES})
++target_link_libraries (calc_executable task commands columns libshared libshared ${TASK_LIBRARIES})
++target_link_libraries (lex_executable  task commands columns libshared libshared ${TASK_LIBRARIES})
+ 
+ set_property (TARGET task_executable PROPERTY OUTPUT_NAME "task")
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/taskwarrior.git/commitdiff/15b2e3616afc7b5cab17beb40b6bd549a9a3a44a



More information about the pld-cvs-commit mailing list