From 77a42b897dfcdf8cdcfd0a403a3483d31860ad47 Mon Sep 17 00:00:00 2001
From: Nikos Roussos <nikos@roussos.cc>
Date: May 16 2016 21:36:09 +0000
Subject: Update to 2.2.0


---

diff --git a/owncloud-client-2.2.0-rpath.patch b/owncloud-client-2.2.0-rpath.patch
index 8a9a7f5..78ed2ed 100644
--- a/owncloud-client-2.2.0-rpath.patch
+++ b/owncloud-client-2.2.0-rpath.patch
@@ -1,48 +1,48 @@
-diff -urNr client-2.2.0/src/cmd/CMakeLists.txt client-2.2.0-original/src/cmd/CMakeLists.txt
---- client-2.2.0/src/cmd/CMakeLists.txt	2016-05-16 22:40:03.435679178 +0200
-+++ client-2.2.0-original/src/cmd/CMakeLists.txt	2016-05-12 09:59:12.000000000 +0200
+diff -ur owncloudclient-2.2.0.orig/src/cmd/CMakeLists.txt owncloudclient-2.2.0/src/cmd/CMakeLists.txt
+--- owncloudclient-2.2.0.orig/src/cmd/CMakeLists.txt	2016-05-16 21:29:00.147014470 +0300
++++ owncloudclient-2.2.0/src/cmd/CMakeLists.txt	2016-05-16 21:35:46.084998523 +0300
 @@ -26,7 +26,7 @@
  	set_target_properties(${cmd_NAME} PROPERTIES
  	        RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
          set_target_properties(${cmd_NAME} PROPERTIES
--		INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
-+		INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+-		INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
++		INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
  
  	target_link_libraries(${cmd_NAME} ${synclib_NAME})
  endif()
-diff -urNr client-2.2.0/src/crashreporter/CMakeLists.txt client-2.2.0-original/src/crashreporter/CMakeLists.txt
---- client-2.2.0/src/crashreporter/CMakeLists.txt	2016-05-16 22:36:37.271166579 +0200
-+++ client-2.2.0-original/src/crashreporter/CMakeLists.txt	2016-05-12 09:59:12.000000000 +0200
+diff -ur owncloudclient-2.2.0.orig/src/crashreporter/CMakeLists.txt owncloudclient-2.2.0/src/crashreporter/CMakeLists.txt
+--- owncloudclient-2.2.0.orig/src/crashreporter/CMakeLists.txt	2016-05-16 21:29:00.147014470 +0300
++++ owncloudclient-2.2.0/src/crashreporter/CMakeLists.txt	2016-05-16 21:36:19.744422147 +0300
 @@ -36,7 +36,7 @@
  
      set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES AUTOMOC ON)
      set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
--    set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
-+    set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+-    set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
++    set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
      target_link_libraries(${CRASHREPORTER_EXECUTABLE}
          crashreporter-gui
          ${QT_LIBRARIES}
-diff -urNr client-2.2.0/src/gui/CMakeLists.txt client-2.2.0-original/src/gui/CMakeLists.txt
---- client-2.2.0/src/gui/CMakeLists.txt	2016-05-16 22:39:08.974864579 +0200
-+++ client-2.2.0-original/src/gui/CMakeLists.txt	2016-05-12 09:59:12.000000000 +0200
+diff -ur owncloudclient-2.2.0.orig/src/gui/CMakeLists.txt owncloudclient-2.2.0/src/gui/CMakeLists.txt
+--- owncloudclient-2.2.0.orig/src/gui/CMakeLists.txt	2016-05-16 21:29:00.149014483 +0300
++++ owncloudclient-2.2.0/src/gui/CMakeLists.txt	2016-05-16 21:38:40.970218989 +0300
 @@ -283,7 +283,7 @@
  )
  # Only relevant for Linux? On OS X it by default properly checks in the bundle directory next to the exe
  set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
--	INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
-+	INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+-	INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
++	INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
  
  target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
  target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
-diff -urNr client-2.2.0/src/libsync/CMakeLists.txt client-2.2.0-original/src/libsync/CMakeLists.txt
---- client-2.2.0/src/libsync/CMakeLists.txt	2016-05-16 22:38:25.191817566 +0200
-+++ client-2.2.0-original/src/libsync/CMakeLists.txt	2016-05-12 09:59:12.000000000 +0200
+diff -ur owncloudclient-2.2.0.orig/src/libsync/CMakeLists.txt owncloudclient-2.2.0/src/libsync/CMakeLists.txt
+--- owncloudclient-2.2.0.orig/src/libsync/CMakeLists.txt	2016-05-16 21:29:00.142014438 +0300
++++ owncloudclient-2.2.0/src/libsync/CMakeLists.txt	2016-05-16 21:39:03.435501701 +0300
 @@ -148,7 +148,7 @@
  	RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
  )
  set_target_properties( ${synclib_NAME} PROPERTIES
--	INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
-+	INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+-	INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
++	INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
  
  target_link_libraries(${synclib_NAME} ${libsync_LINK_TARGETS} )
  
diff --git a/owncloud-client-2.2.0-syslibs.patch b/owncloud-client-2.2.0-syslibs.patch
index 77a3ef0..17f4ac6 100644
--- a/owncloud-client-2.2.0-syslibs.patch
+++ b/owncloud-client-2.2.0-syslibs.patch
@@ -1,36 +1,36 @@
-diff -urNr client-2.2.0/src/3rdparty/qtsingleapplication/qtlocalpeer.h client-2.2.0-original/src/3rdparty/qtsingleapplication/qtlocalpeer.h
---- client-2.2.0/src/3rdparty/qtsingleapplication/qtlocalpeer.h	2016-05-16 22:47:07.968438747 +0200
-+++ client-2.2.0-original/src/3rdparty/qtsingleapplication/qtlocalpeer.h	2016-05-12 09:59:12.000000000 +0200
+diff -ur owncloudclient-2.2.0.orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h owncloudclient-2.2.0/src/3rdparty/qtsingleapplication/qtlocalpeer.h
+--- owncloudclient-2.2.0.orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h	2016-05-16 21:29:00.151014495 +0300
++++ owncloudclient-2.2.0/src/3rdparty/qtsingleapplication/qtlocalpeer.h	2016-05-16 21:41:03.791016304 +0300
 @@ -27,7 +27,7 @@
  **
  ****************************************************************************/
  
--#include <qt5/QTSolutions/qtlockedfile.h>
-+#include <qtlockedfile.h>
+-#include <qtlockedfile.h>
++#include <qt5/QTSolutions/qtlockedfile.h>
  
  #include <QLocalServer>
  #include <QLocalSocket>
-diff -urNr client-2.2.0/src/gui/application.cpp client-2.2.0-original/src/gui/application.cpp
---- client-2.2.0/src/gui/application.cpp	2016-05-16 22:47:54.843418460 +0200
-+++ client-2.2.0-original/src/gui/application.cpp	2016-05-12 09:59:12.000000000 +0200
+diff -ur owncloudclient-2.2.0.orig/src/gui/application.cpp owncloudclient-2.2.0/src/gui/application.cpp
+--- owncloudclient-2.2.0.orig/src/gui/application.cpp	2016-05-16 21:29:00.149014483 +0300
++++ owncloudclient-2.2.0/src/gui/application.cpp	2016-05-16 21:41:37.774443966 +0300
 @@ -92,7 +92,7 @@
  // ----------------------------------------------------------------------------------
  
  Application::Application(int &argc, char **argv) :
--    QtSingleApplication(Theme::instance()->appName() ,argc, argv),
-+    SharedTools::QtSingleApplication(Theme::instance()->appName() ,argc, argv),
+-    SharedTools::QtSingleApplication(Theme::instance()->appName() ,argc, argv),
++    QtSingleApplication(Theme::instance()->appName() ,argc, argv),
      _gui(0),
      _theme(Theme::instance()),
      _helpOnly(false),
-diff -urNr client-2.2.0/src/gui/application.h client-2.2.0-original/src/gui/application.h
---- client-2.2.0/src/gui/application.h	2016-05-16 22:49:06.088867724 +0200
-+++ client-2.2.0-original/src/gui/application.h	2016-05-12 09:59:12.000000000 +0200
+diff -ur owncloudclient-2.2.0.orig/src/gui/application.h owncloudclient-2.2.0/src/gui/application.h
+--- owncloudclient-2.2.0.orig/src/gui/application.h	2016-05-16 21:29:00.149014483 +0300
++++ owncloudclient-2.2.0/src/gui/application.h	2016-05-16 21:42:17.608945259 +0300
 @@ -22,7 +22,7 @@
  #include <QElapsedTimer>
  #include <QNetworkConfigurationManager>
  
--#include "qt5/QtSolutions/QtSingleApplication"
-+#include "qtsingleapplication.h"
+-#include "qtsingleapplication.h"
++#include "qt5/QtSolutions/QtSingleApplication"
  
  #include "syncresult.h"
  #include "logbrowser.h"
@@ -38,50 +38,50 @@ diff -urNr client-2.2.0/src/gui/application.h client-2.2.0-original/src/gui/appl
   * @brief The Application class
   * @ingroup gui
   */
--class Application : public QtSingleApplication
-+class Application : public SharedTools::QtSingleApplication
+-class Application : public SharedTools::QtSingleApplication
++class Application : public QtSingleApplication
  {
      Q_OBJECT
  public:
-diff -urNr client-2.2.0/src/gui/CMakeLists.txt client-2.2.0-original/src/gui/CMakeLists.txt
---- client-2.2.0/src/gui/CMakeLists.txt	2016-05-16 22:52:39.981214976 +0200
-+++ client-2.2.0-original/src/gui/CMakeLists.txt	2016-05-12 09:59:12.000000000 +0200
-@@ -143,6 +143,10 @@
+diff -ur owncloudclient-2.2.0.orig/src/gui/CMakeLists.txt owncloudclient-2.2.0/src/gui/CMakeLists.txt
+--- owncloudclient-2.2.0.orig/src/gui/CMakeLists.txt	2016-05-16 21:29:00.149014483 +0300
++++ owncloudclient-2.2.0/src/gui/CMakeLists.txt	2016-05-16 21:43:44.093190156 +0300
+@@ -143,10 +143,6 @@
  
  set(3rdparty_SRC
      ../3rdparty/QProgressIndicator/QProgressIndicator.cpp
-+    ../3rdparty/qtlockedfile/qtlockedfile.cpp
-+    ../3rdparty/qtsingleapplication/qtlocalpeer.cpp
-+    ../3rdparty/qtsingleapplication/qtsingleapplication.cpp
-+    ../3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
+-    ../3rdparty/qtlockedfile/qtlockedfile.cpp
+-    ../3rdparty/qtsingleapplication/qtlocalpeer.cpp
+-    ../3rdparty/qtsingleapplication/qtsingleapplication.cpp
+-    ../3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
      ../3rdparty/certificates/p12topem.cpp
     )
  
-@@ -154,10 +158,18 @@
+@@ -158,18 +154,10 @@
          )
  endif()
  
-+if(NOT WIN32)
-+   list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_unix.cpp)
-+else()
-+   list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_win.cpp )
-+endif()
-+
+-if(NOT WIN32)
+-   list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_unix.cpp)
+-else()
+-   list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_win.cpp )
+-endif()
+-
  set(3rdparty_INC
      ${CMAKE_SOURCE_DIR}/src/3rdparty/qjson
      ${CMAKE_SOURCE_DIR}/src/3rdparty/QProgressIndicator
-+    ${CMAKE_SOURCE_DIR}/src/3rdparty/qtlockedfile
+-    ${CMAKE_SOURCE_DIR}/src/3rdparty/qtlockedfile
      ${CMAKE_SOURCE_DIR}/src/3rdparty/qtmacgoodies/src
-+    ${CMAKE_SOURCE_DIR}/src/3rdparty/qtsingleapplication
+-    ${CMAKE_SOURCE_DIR}/src/3rdparty/qtsingleapplication
      )
  
  include_directories(${3rdparty_INC})
-@@ -276,8 +288,6 @@
+@@ -288,6 +276,8 @@
  target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
  target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
  target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
--target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5Solutions_LockedFile-2.4 )
--target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5Solutions_SingleApplication-2.6 )
++target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5Solutions_LockedFile-2.4 )
++target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5Solutions_SingleApplication-2.6 )
  target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} )
  
  if(WITH_CRASHREPORTER)
diff --git a/owncloud-client.spec b/owncloud-client.spec
index 25b5dfb..ca595ee 100644
--- a/owncloud-client.spec
+++ b/owncloud-client.spec
@@ -1,3 +1,5 @@
+%global _hardened_build 1
+
 Name:           owncloud-client
 Version:        2.2.0
 Release:        1%{?dist}
@@ -164,8 +166,11 @@ fi
 %{_datadir}/nemo-python/extensions/*
 
 %changelog
-* Mon May 16 2016 Germano Massullo <germano.massullo@gmail.com> - 2.2.0-1
-- 2.2.0 update
+* Mon May 16 2016 Nikos Roussos <comzeradd@fedoraproject.org> - 2.2.0-1
+- Updated to 2.2.0
+- Add hardened flag
+- Update patches
+- Remove merged patch
 
 * Mon May 16 2016 Germano Massullo <germano.massullo@gmail.com> - 2.1.1-3
 - Added BuildRequires:  openssl-devel to fix epel7 build problems. This buildrequires seems to be fine for other branches too.