diff --git a/.gitignore b/.gitignore index 1bb5d8e..8e2d4cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /owncloudclient-2.1.0.tar.xz /client-2.1.1.tar.gz /owncloudclient-2.1.1.tar.xz +/owncloudclient-2.2.0.tar.xz diff --git a/owncloud-client-2.2.0-rpath.patch b/owncloud-client-2.2.0-rpath.patch new file mode 100644 index 0000000..8a9a7f5 --- /dev/null +++ b/owncloud-client-2.2.0-rpath.patch @@ -0,0 +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 +@@ -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}" ) + + 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 +@@ -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}" ) + 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 +@@ -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}" ) + + 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 +@@ -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}" ) + + 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 new file mode 100644 index 0000000..77a3ef0 --- /dev/null +++ b/owncloud-client-2.2.0-syslibs.patch @@ -0,0 +1,87 @@ +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 +@@ -27,7 +27,7 @@ + ** + ****************************************************************************/ + +-#include ++#include + + #include + #include +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 +@@ -92,7 +92,7 @@ + // ---------------------------------------------------------------------------------- + + Application::Application(int &argc, char **argv) : +- QtSingleApplication(Theme::instance()->appName() ,argc, argv), ++ SharedTools::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 +@@ -22,7 +22,7 @@ + #include + #include + +-#include "qt5/QtSolutions/QtSingleApplication" ++#include "qtsingleapplication.h" + + #include "syncresult.h" + #include "logbrowser.h" +@@ -49,7 +49,7 @@ + * @brief The Application class + * @ingroup gui + */ +-class Application : public QtSingleApplication ++class Application : public SharedTools::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 @@ + + set(3rdparty_SRC + ../3rdparty/QProgressIndicator/QProgressIndicator.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 @@ + ) + 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/qtmacgoodies/src ++ ${CMAKE_SOURCE_DIR}/src/3rdparty/qtsingleapplication + ) + + include_directories(${3rdparty_INC}) +@@ -276,8 +288,6 @@ + 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} ${OS_SPECIFIC_LINK_LIBRARIES} ) + + if(WITH_CRASHREPORTER) diff --git a/owncloud-client.spec b/owncloud-client.spec index 0cb4e1d..25b5dfb 100644 --- a/owncloud-client.spec +++ b/owncloud-client.spec @@ -1,6 +1,6 @@ Name: owncloud-client -Version: 2.1.1 -Release: 3%{?dist} +Version: 2.2.0 +Release: 1%{?dist} Summary: The ownCloud Client # -libs are LGPLv2+, rest GPLv2 @@ -11,7 +11,6 @@ Source1: %{name}.appdata.xml Patch0: %{name}-%{version}-syslibs.patch # Port of https://github.com/owncloud/client/issues/4239 Patch1: %{name}-%{version}-rpath.patch -Patch2: %{name}-%{version}-shebang.patch BuildRequires: check BuildRequires: cmake @@ -165,6 +164,9 @@ fi %{_datadir}/nemo-python/extensions/* %changelog +* Mon May 16 2016 Germano Massullo - 2.2.0-1 +- 2.2.0 update + * Mon May 16 2016 Germano Massullo - 2.1.1-3 - Added BuildRequires: openssl-devel to fix epel7 build problems. This buildrequires seems to be fine for other branches too. diff --git a/sources b/sources index 8ed3741..91378c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -63a971158201a8dffe96a02c54b86819 owncloudclient-2.1.1.tar.xz +06a0e55771e5ee331dc961edc7e7008a owncloudclient-2.2.0.tar.xz