diff --git a/.gitignore b/.gitignore index 87fb38d..40bed0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /x2godesktopsharing-3.1.1.0.tar.gz /x2godesktopsharing-3.1.1.1.tar.gz /x2godesktopsharing-3.1.1.2.tar.gz +/x2godesktopsharing-3.1.1.3.tar.gz diff --git a/sources b/sources index cfcb15e..44e1d83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd48394f5a4eaa55559622f21a5e0a79 x2godesktopsharing-3.1.1.2.tar.gz +e5d4c4393ed5dde7e0790d7cded56cc2 x2godesktopsharing-3.1.1.3.tar.gz diff --git a/x2godesktopsharing-time.patch b/x2godesktopsharing-time.patch deleted file mode 100644 index eed747e..0000000 --- a/x2godesktopsharing-time.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up x2godesktopsharing-3.1.1.2/sharetray.cpp.time x2godesktopsharing-3.1.1.2/sharetray.cpp ---- x2godesktopsharing-3.1.1.2/sharetray.cpp.time 2015-03-05 21:11:16.000000000 -0700 -+++ x2godesktopsharing-3.1.1.2/sharetray.cpp 2016-02-06 13:57:28.437811687 -0700 -@@ -93,8 +93,8 @@ ShareTray::ShareTray() - { - QString line = in.readLine(); - file.close(); -- if ( abs ( line.toUInt() - -- QDateTime::currentDateTime().toTime_t() ) <5 ) -+ if ( abs ( int ( line.toUInt() - -+ QDateTime::currentDateTime().toTime_t() ) ) <5 ) - { - - QString message=QString ( diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index e1a8626..d4283fd 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -1,15 +1,12 @@ Name: x2godesktopsharing -Version: 3.1.1.2 -Release: 6%{?dist} +Version: 3.1.1.3 +Release: 1%{?dist} Summary: Share X11 desktops with other users via X2Go Group: Applications/Communications License: GPLv2+ URL: http://www.x2go.org Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz -# Fix abs call with time values -# http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=993 -Patch0: x2godesktopsharing-time.patch BuildRequires: desktop-file-utils BuildRequires: qt4-devel @@ -25,7 +22,6 @@ a local X11 session. %prep %setup -q -%patch0 -p1 -b .time %build @@ -86,6 +82,10 @@ fi %changelog +* Tue Jun 7 2016 Orion Poplawski - 3.1.1.3-1 +- Update to 3.1.1.3 +- Drop time patch fixed upstream + * Sat Feb 6 2016 Orion Poplawski - 3.1.1.2-6 - Add patch to fix abs compile error