From 18140be56f506f3d73a2ac6d2adffd6e7978328b Mon Sep 17 00:00:00 2001 From: Nikos Roussos Date: Sep 08 2015 16:53:36 +0000 Subject: Update to 2.0.1 --- diff --git a/.gitignore b/.gitignore index b981614..ed92ba6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /owncloudclient-1.8.4.tar.xz +/owncloudclient-2.0.1.tar.xz diff --git a/owncloud-client-1.8.0-rpath.patch b/owncloud-client-1.8.0-rpath.patch deleted file mode 100644 index a31f228..0000000 --- a/owncloud-client-1.8.0-rpath.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -u --exclude CVS --exclude .svn --exclude .bzr --exclude '*~' -r client-1.8.0-beta2.orig/src/cmd/CMakeLists.txt client-1.8.0-beta2/src/cmd/CMakeLists.txt ---- client-1.8.0-beta2.orig/src/cmd/CMakeLists.txt 2015-03-04 13:50:55.000000000 +0100 -+++ client-1.8.0-beta2/src/cmd/CMakeLists.txt 2015-03-09 23:00:03.238091925 +0100 -@@ -23,7 +23,7 @@ - set_target_properties(${cmd_NAME} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} ) - set_target_properties(${cmd_NAME} PROPERTIES -- 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 -u --exclude CVS --exclude .svn --exclude .bzr --exclude '*~' -r client-1.8.0-beta2.orig/src/crashreporter/CMakeLists.txt client-1.8.0-beta2/src/crashreporter/CMakeLists.txt ---- client-1.8.0-beta2.orig/src/crashreporter/CMakeLists.txt 2015-03-04 13:50:55.000000000 +0100 -+++ client-1.8.0-beta2/src/crashreporter/CMakeLists.txt 2015-03-09 23:01:36.878134317 +0100 -@@ -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 "${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 -u --exclude CVS --exclude .svn --exclude .bzr --exclude '*~' -r client-1.8.0-beta2.orig/src/gui/CMakeLists.txt client-1.8.0-beta2/src/gui/CMakeLists.txt ---- client-1.8.0-beta2.orig/src/gui/CMakeLists.txt 2015-03-09 23:02:41.908774007 +0100 -+++ client-1.8.0-beta2/src/gui/CMakeLists.txt 2015-03-09 22:58:43.207765014 +0100 -@@ -222,7 +222,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 "${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 -u --exclude CVS --exclude .svn --exclude .bzr --exclude '*~' -r client-1.8.0-beta2.orig/src/libsync/CMakeLists.txt client-1.8.0-beta2/src/libsync/CMakeLists.txt ---- client-1.8.0-beta2.orig/src/libsync/CMakeLists.txt 2015-03-04 13:50:55.000000000 +0100 -+++ client-1.8.0-beta2/src/libsync/CMakeLists.txt 2015-03-09 23:00:45.949199021 +0100 -@@ -163,7 +163,7 @@ - RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} - ) - set_target_properties( ${synclib_NAME} PROPERTIES -- 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-1.8.0-syslibs.patch b/owncloud-client-1.8.0-syslibs.patch deleted file mode 100644 index e4f1c5d..0000000 --- a/owncloud-client-1.8.0-syslibs.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff -u --exclude CVS --exclude .svn --exclude .bzr -r client-1.8.0-beta2.orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h client-1.8.0-beta2/src/3rdparty/qtsingleapplication/qtlocalpeer.h ---- client-1.8.0-beta2.orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2015-03-04 13:50:55.000000000 +0100 -+++ client-1.8.0-beta2/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2015-03-09 22:28:22.536743646 +0100 -@@ -27,7 +27,7 @@ - ** - ****************************************************************************/ - --#include -+#include - - #include - #include -Seulement dans client-1.8.0-beta2/src/3rdparty/qtsingleapplication: qtlocalpeer.h~ -diff -u --exclude CVS --exclude .svn --exclude .bzr -r client-1.8.0-beta2.orig/src/gui/CMakeLists.txt client-1.8.0-beta2/src/gui/CMakeLists.txt ---- client-1.8.0-beta2.orig/src/gui/CMakeLists.txt 2015-03-04 13:50:55.000000000 +0100 -+++ client-1.8.0-beta2/src/gui/CMakeLists.txt 2015-03-09 22:34:08.593537799 +0100 -@@ -107,10 +107,6 @@ - set(3rdparty_SRC - ../3rdparty/fancylineedit/fancylineedit.cpp - ../3rdparty/QProgressIndicator/QProgressIndicator.cpp -- ../3rdparty/qtlockedfile/qtlockedfile.cpp -- ../3rdparty/qtsingleapplication/qtlocalpeer.cpp -- ../3rdparty/qtsingleapplication/qtsingleapplication.cpp -- ../3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp - ../3rdparty/certificates/p12topem.cpp - ) - -@@ -122,19 +118,11 @@ - ) - 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/fancylineedit - ${CMAKE_SOURCE_DIR}/src/3rdparty/qjson - ${CMAKE_SOURCE_DIR}/src/3rdparty/QProgressIndicator -- ${CMAKE_SOURCE_DIR}/src/3rdparty/qtlockedfile - ${CMAKE_SOURCE_DIR}/src/3rdparty/qtmacgoodies/src -- ${CMAKE_SOURCE_DIR}/src/3rdparty/qtsingleapplication - ) - - include_directories(${3rdparty_INC}) -@@ -239,6 +227,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} QtSolutions_LockedFile-2.4 ) -+target_link_libraries( ${APPLICATION_EXECUTABLE} QtSolutions_SingleApplication-2.6 ) - target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} ) - - if(WITH_CRASHREPORTER) -Seulement dans client-1.8.0-beta2/src/gui: CMakeLists.txt~ -diff -u --exclude CVS --exclude .svn --exclude .bzr -r client-1.8.0-beta2.orig/src/gui/application.cpp client-1.8.0-beta2/src/gui/application.cpp ---- client-1.8.0-beta2.orig/src/gui/application.cpp 2015-03-04 13:50:55.000000000 +0100 -+++ client-1.8.0-beta2/src/gui/application.cpp 2015-03-09 22:37:39.509145961 +0100 -@@ -80,7 +80,7 @@ - // ---------------------------------------------------------------------------------- - - Application::Application(int &argc, char **argv) : -- SharedTools::QtSingleApplication(Theme::instance()->appName() ,argc, argv), -+ QtSingleApplication(Theme::instance()->appName() ,argc, argv), - _gui(0), - _theme(Theme::instance()), - _helpOnly(false), -@@ -481,7 +481,7 @@ - return true; - } - -- return SharedTools::QtSingleApplication::winEventFilter(pMsg, result); -+ return QtSingleApplication::winEventFilter(pMsg, result); - } - #endif - -Seulement dans client-1.8.0-beta2/src/gui: application.cpp~ -diff -u --exclude CVS --exclude .svn --exclude .bzr -r client-1.8.0-beta2.orig/src/gui/application.h client-1.8.0-beta2/src/gui/application.h ---- client-1.8.0-beta2.orig/src/gui/application.h 2015-03-04 13:50:55.000000000 +0100 -+++ client-1.8.0-beta2/src/gui/application.h 2015-03-09 22:39:01.327442281 +0100 -@@ -20,7 +20,7 @@ - #include - #include - --#include "qtsingleapplication.h" -+#include "QtSolutions/QtSingleApplication" - - #include "syncresult.h" - #include "logbrowser.h" -@@ -39,7 +39,7 @@ - class Folder; - class SslErrorDialog; - --class Application : public SharedTools::QtSingleApplication -+class Application : public QtSingleApplication - { - Q_OBJECT - public: -Seulement dans client-1.8.0-beta2/src/gui: application.h~ diff --git a/owncloud-client-2.0.1-rpath.patch b/owncloud-client-2.0.1-rpath.patch new file mode 100644 index 0000000..6072fa8 --- /dev/null +++ b/owncloud-client-2.0.1-rpath.patch @@ -0,0 +1,48 @@ +diff -ur owncloudclient-2.0.1.orig/src/cmd/CMakeLists.txt owncloudclient-2.0.1/src/cmd/CMakeLists.txt +--- owncloudclient-2.0.1.orig/src/cmd/CMakeLists.txt 2015-09-08 19:26:20.631229885 +0300 ++++ owncloudclient-2.0.1/src/cmd/CMakeLists.txt 2015-09-08 19:36:50.369513888 +0300 +@@ -23,7 +23,7 @@ + set_target_properties(${cmd_NAME} PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} ) + set_target_properties(${cmd_NAME} PROPERTIES +- 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 -ur owncloudclient-2.0.1.orig/src/crashreporter/CMakeLists.txt owncloudclient-2.0.1/src/crashreporter/CMakeLists.txt +--- owncloudclient-2.0.1.orig/src/crashreporter/CMakeLists.txt 2015-09-08 19:26:20.631229885 +0300 ++++ owncloudclient-2.0.1/src/crashreporter/CMakeLists.txt 2015-09-08 19:37:14.124735192 +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 "${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 -ur owncloudclient-2.0.1.orig/src/gui/CMakeLists.txt owncloudclient-2.0.1/src/gui/CMakeLists.txt +--- owncloudclient-2.0.1.orig/src/gui/CMakeLists.txt 2015-09-08 19:26:20.632229887 +0300 ++++ owncloudclient-2.0.1/src/gui/CMakeLists.txt 2015-09-08 19:38:05.229865174 +0300 +@@ -261,7 +261,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 "${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 -ur owncloudclient-2.0.1.orig/src/libsync/CMakeLists.txt owncloudclient-2.0.1/src/libsync/CMakeLists.txt +--- owncloudclient-2.0.1.orig/src/libsync/CMakeLists.txt 2015-09-08 19:26:20.635229893 +0300 ++++ owncloudclient-2.0.1/src/libsync/CMakeLists.txt 2015-09-08 19:38:22.900903722 +0300 +@@ -158,7 +158,7 @@ + RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} + ) + set_target_properties( ${synclib_NAME} PROPERTIES +- 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.0.1-syslibs.patch b/owncloud-client-2.0.1-syslibs.patch new file mode 100644 index 0000000..f66db6f --- /dev/null +++ b/owncloud-client-2.0.1-syslibs.patch @@ -0,0 +1,88 @@ +diff -ur owncloudclient-2.0.1.orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h owncloudclient-2.0.1/src/3rdparty/qtsingleapplication/qtlocalpeer.h +--- owncloudclient-2.0.1.orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2015-09-08 19:26:20.625229873 +0300 ++++ owncloudclient-2.0.1/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2015-09-08 19:26:42.162924668 +0300 +@@ -27,7 +27,7 @@ + ** + ****************************************************************************/ + +-#include ++#include + + #include + #include +diff -ur owncloudclient-2.0.1.orig/src/gui/application.cpp owncloudclient-2.0.1/src/gui/application.cpp +--- owncloudclient-2.0.1.orig/src/gui/application.cpp 2015-09-08 19:26:20.632229887 +0300 ++++ owncloudclient-2.0.1/src/gui/application.cpp 2015-09-08 19:30:46.836978916 +0300 +@@ -84,7 +84,7 @@ + // ---------------------------------------------------------------------------------- + + Application::Application(int &argc, char **argv) : +- SharedTools::QtSingleApplication(Theme::instance()->appName() ,argc, argv), ++ QtSingleApplication(Theme::instance()->appName() ,argc, argv), + _gui(0), + _theme(Theme::instance()), + _helpOnly(false), +diff -ur owncloudclient-2.0.1.orig/src/gui/application.h owncloudclient-2.0.1/src/gui/application.h +--- owncloudclient-2.0.1.orig/src/gui/application.h 2015-09-08 19:26:20.632229887 +0300 ++++ owncloudclient-2.0.1/src/gui/application.h 2015-09-08 19:32:24.745101837 +0300 +@@ -20,7 +20,7 @@ + #include + #include + +-#include "qtsingleapplication.h" ++#include "QtSolutions/QtSingleApplication" + + #include "syncresult.h" + #include "logbrowser.h" +@@ -47,7 +47,7 @@ + * @brief The Application class + * @ingroup gui + */ +-class Application : public SharedTools::QtSingleApplication ++class Application : public QtSingleApplication + { + Q_OBJECT + public: +diff -ur owncloudclient-2.0.1.orig/src/gui/CMakeLists.txt owncloudclient-2.0.1/src/gui/CMakeLists.txt +--- owncloudclient-2.0.1.orig/src/gui/CMakeLists.txt 2015-09-08 19:26:20.632229887 +0300 ++++ owncloudclient-2.0.1/src/gui/CMakeLists.txt 2015-09-08 19:29:09.912584234 +0300 +@@ -120,10 +120,6 @@ + set(3rdparty_SRC + ../3rdparty/fancylineedit/fancylineedit.cpp + ../3rdparty/QProgressIndicator/QProgressIndicator.cpp +- ../3rdparty/qtlockedfile/qtlockedfile.cpp +- ../3rdparty/qtsingleapplication/qtlocalpeer.cpp +- ../3rdparty/qtsingleapplication/qtsingleapplication.cpp +- ../3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp + ../3rdparty/certificates/p12topem.cpp + ) + +@@ -135,19 +131,11 @@ + ) + 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/fancylineedit + ${CMAKE_SOURCE_DIR}/src/3rdparty/qjson + ${CMAKE_SOURCE_DIR}/src/3rdparty/QProgressIndicator +- ${CMAKE_SOURCE_DIR}/src/3rdparty/qtlockedfile + ${CMAKE_SOURCE_DIR}/src/3rdparty/qtmacgoodies/src +- ${CMAKE_SOURCE_DIR}/src/3rdparty/qtsingleapplication + ) + + include_directories(${3rdparty_INC}) +@@ -266,6 +254,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} QtSolutions_LockedFile-2.4 ) ++target_link_libraries( ${APPLICATION_EXECUTABLE} QtSolutions_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 8d4577b..32cf8af 100644 --- a/owncloud-client.spec +++ b/owncloud-client.spec @@ -1,6 +1,6 @@ Name: owncloud-client -Version: 1.8.4 -Release: 3%{?dist} +Version: 2.0.1 +Release: 1%{?dist} Summary: The ownCloud Client # -libs are LGPLv2+, rest GPLv2 @@ -8,9 +8,9 @@ License: LGPLv2+ and GPLv2 Url: http://owncloud.org/sync-clients/ Source0: http://download.owncloud.com/desktop/stable/owncloudclient-%{version}.tar.xz Source1: %{name}.appdata.xml -Patch0: %{name}-1.8.0-syslibs.patch +Patch0: %{name}-2.0.1-syslibs.patch # Port of https://github.com/owncloud/client/pull/2104 -Patch1: %{name}-1.8.0-rpath.patch +Patch1: %{name}-2.0.1-rpath.patch BuildRequires: cmake BuildRequires: qt4-devel @@ -145,6 +145,9 @@ fi %changelog +* Tue Sep 08 2015 Nikos Roussos - 2.0.1-1 +- Updated to 2.0.1 + * Thu Sep 03 2015 Nikos Roussos - 1.8.5-2 - remove extraneous client subpackage - use macros for versions diff --git a/sources b/sources index 69afbf0..40d92a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ce82c234fca674062599b3ceb4ac50c6 owncloudclient-1.8.4.tar.xz +e87a01e464f005cf95cde83f46cf318d owncloudclient-2.0.1.tar.xz