commit d3643851c0a6c691ef6e2e2dff334242289c56a5
Author: Elan Ruusamäe <[email protected]>
Date: Fri Dec 5 15:28:50 2014 +0200
use system ca certs
ca-cert-path.patch | 11 +++++++++++
toggl-desktop.spec | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/toggl-desktop.spec b/toggl-desktop.spec
index 0ba6b4b..9201869 100644
--- a/toggl-desktop.spec
+++ b/toggl-desktop.spec
@@ -8,7 +8,7 @@
Summary: Desktop client for the Toggle time tracking service
Name: toggl-desktop
Version: 7.1.146
-Release: 0.3
+Release: 0.4
License: LGPL v2.1
Group: X11/Applications
# https://www.toggl.com/tour/desktop
@@ -16,6 +16,7 @@ Source0:
https://github.com/toggl/toggldesktop/archive/v%{version}/%{name}-%{ver
# Source0-md5: b83b3e97e8aefd6d9280357a541aa2d1
Source1: TogglDesktop.desktop
URL: https://github.com/toggl/toggldesktop
+Patch0: ca-cert-path.patch
BuildRequires: Qt5Core-devel >= %{qtver}
BuildRequires: Qt5Gui-devel >= %{qtver}
BuildRequires: Qt5Network-devel >= %{qtver}
@@ -41,6 +42,7 @@ application supports both the classic Timer and the new Nano.
%prep
%setup -q -n toggldesktop-%{version}
+%patch0 -p1
%{__sed} -i -e 's,cxx=g++,cxx=$(CXX),' Makefile
%{__sed} -i -e 's,cflags=-g,cflags=-g $(CXXFLAGS),' Makefile
diff --git a/ca-cert-path.patch b/ca-cert-path.patch
new file mode 100644
index 0000000..54203d1
--- /dev/null
+++ b/ca-cert-path.patch
@@ -0,0 +1,11 @@
+--- toggldesktop-7.1.146/src/ui/linux/TogglDesktop/toggl.cpp~ 2014-12-04
02:53:08.000000000 +0200
++++ toggldesktop-7.1.146/src/ui/linux/TogglDesktop/toggl.cpp 2014-12-05
15:19:03.383618995 +0200
+@@ -179,7 +179,7 @@
+
+ QString executablePath = QCoreApplication::applicationDirPath();
+ QDir executableDir = QDir(executablePath);
+- QString cacertPath = executableDir.filePath("cacert.pem");
++ QString cacertPath =
executableDir.filePath("/etc/certs/ca-certificates.crt");
+ toggl_set_cacert_path(ctx, cacertPath.toUtf8().constData());
+
+ toggl_on_show_app(ctx, on_display_app);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/toggl-desktop.git/commitdiff/d3643851c0a6c691ef6e2e2dff334242289c56a5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
