From 36cf52cbaf90f1b38cc1771e215daf757d26d2c7 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Feb 10 2016 18:12:29 +0000 Subject: updated to version 2.1.1 --- diff --git a/.gitignore b/.gitignore index 1b39463..edea64a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /owncloudclient-2.1.0.tar.xz +/client-2.1.1.tar.gz diff --git a/owncloud-client-2.1.1-rpath.patch b/owncloud-client-2.1.1-rpath.patch new file mode 100644 index 0000000..3636f1a --- /dev/null +++ b/owncloud-client-2.1.1-rpath.patch @@ -0,0 +1,48 @@ +diff -urNr client-2.1.1-orig/src/cmd/CMakeLists.txt client-2.1.1/src/cmd/CMakeLists.txt +--- client-2.1.1-orig/src/cmd/CMakeLists.txt 2016-02-09 16:07:08.000000000 +0100 ++++ client-2.1.1/src/cmd/CMakeLists.txt 2016-02-10 18:51:41.972455649 +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 -urNr client-2.1.1-orig/src/crashreporter/CMakeLists.txt client-2.1.1/src/crashreporter/CMakeLists.txt +--- client-2.1.1-orig/src/crashreporter/CMakeLists.txt 2016-02-09 16:07:08.000000000 +0100 ++++ client-2.1.1/src/crashreporter/CMakeLists.txt 2016-02-10 18:52:30.890390103 +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 -urNr client-2.1.1-orig/src/gui/CMakeLists.txt client-2.1.1/src/gui/CMakeLists.txt +--- client-2.1.1-orig/src/gui/CMakeLists.txt 2016-02-09 16:07:08.000000000 +0100 ++++ client-2.1.1/src/gui/CMakeLists.txt 2016-02-10 18:53:20.748304082 +0100 +@@ -276,7 +276,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 -urNr client-2.1.1-orig/src/libsync/CMakeLists.txt client-2.1.1/src/libsync/CMakeLists.txt +--- client-2.1.1-orig/src/libsync/CMakeLists.txt 2016-02-09 16:07:08.000000000 +0100 ++++ client-2.1.1/src/libsync/CMakeLists.txt 2016-02-10 18:54:14.004144045 +0100 +@@ -147,7 +147,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.1.1-shebang.patch b/owncloud-client-2.1.1-shebang.patch new file mode 100644 index 0000000..954d0c6 --- /dev/null +++ b/owncloud-client-2.1.1-shebang.patch @@ -0,0 +1,18 @@ +diff -urNr client-2.1.1-orig/shell_integration/nautilus/syncstate.py client-2.1.1/shell_integration/nautilus/syncstate.py +--- client-2.1.1-orig/shell_integration/nautilus/syncstate.py 2016-02-09 16:07:08.000000000 +0100 ++++ client-2.1.1/shell_integration/nautilus/syncstate.py 2016-02-10 12:34:48.186760697 +0100 +@@ -1,5 +1,3 @@ +-#!/usr/bin/python3 +-# + # Copyright (C) by Klaas Freitag + # + # This program is the core of OwnCloud integration to Nautilus +diff -urNr client-2.1.1-orig/shell_integration/nautilus/syncstate.py client-2.1.1/shell_integration/nautilus/syncstate.py +--- client-2.1.1-orig/shell_integration/nautilus/syncstate.py 2016-02-09 16:07:08.000000000 +0100 ++++ client-2.1.1/shell_integration/nautilus/syncstate.py 2016-02-10 12:34:48.186760697 +0100 +@@ -1,5 +1,3 @@ +-#!/usr/bin/python3 +-# + # Copyright (C) by Klaas Freitag + # + # This program is the core of OwnCloud integration to Nautilus diff --git a/owncloud-client-2.1.1-syslibs.patch b/owncloud-client-2.1.1-syslibs.patch new file mode 100644 index 0000000..cd81824 --- /dev/null +++ b/owncloud-client-2.1.1-syslibs.patch @@ -0,0 +1,88 @@ +diff -urNr client-2.1.1-orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h client-2.1.1/src/3rdparty/qtsingleapplication/qtlocalpeer.h +--- client-2.1.1-orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2016-02-09 16:07:08.000000000 +0100 ++++ client-2.1.1/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2016-02-10 18:57:13.283239761 +0100 +@@ -27,7 +27,7 @@ + ** + ****************************************************************************/ + +-#include ++#include + + #include + #include +diff -urNr client-2.1.1-orig/src/gui/application.cpp client-2.1.1/src/gui/application.cpp +--- client-2.1.1-orig/src/gui/application.cpp 2016-02-09 16:07:08.000000000 +0100 ++++ client-2.1.1/src/gui/application.cpp 2016-02-10 18:57:58.390257879 +0100 +@@ -92,7 +92,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 -urNr client-2.1.1-orig/src/gui/application.h client-2.1.1/src/gui/application.h +--- client-2.1.1-orig/src/gui/application.h 2016-02-09 16:07:08.000000000 +0100 ++++ client-2.1.1/src/gui/application.h 2016-02-10 18:59:17.073545113 +0100 +@@ -22,7 +22,7 @@ + #include + #include + +-#include "qtsingleapplication.h" ++#include "qt5/QtSolutions/QtSingleApplication" + + #include "syncresult.h" + #include "logbrowser.h" +@@ -49,7 +49,7 @@ + * @brief The Application class + * @ingroup gui + */ +-class Application : public SharedTools::QtSingleApplication ++class Application : public QtSingleApplication + { + Q_OBJECT + public: +diff -urNr client-2.1.1-orig/src/gui/CMakeLists.txt client-2.1.1/src/gui/CMakeLists.txt +--- client-2.1.1-orig/src/gui/CMakeLists.txt 2016-02-09 16:07:08.000000000 +0100 ++++ client-2.1.1/src/gui/CMakeLists.txt 2016-02-10 19:01:30.585638842 +0100 +@@ -135,10 +135,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 + ) + +@@ -150,19 +146,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}) +@@ -281,6 +269,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} ${OS_SPECIFIC_LINK_LIBRARIES} ) + + if(WITH_CRASHREPORTER) diff --git a/owncloud-client.spec b/owncloud-client.spec index c738524..ccfa8a8 100644 --- a/owncloud-client.spec +++ b/owncloud-client.spec @@ -1,6 +1,6 @@ Name: owncloud-client -Version: 2.1.0 -Release: 2%{?dist} +Version: 2.1.1 +Release: 1%{?dist} Summary: The ownCloud Client # -libs are LGPLv2+, rest GPLv2 @@ -8,9 +8,10 @@ License: LGPLv2+ and GPLv2 Url: http://owncloud.org/sync-clients/ Source0: https://download.owncloud.com/desktop/stable/owncloudclient-%{version}.tar.xz Source1: %{name}.appdata.xml -Patch0: %{name}-2.1.0-syslibs.patch +Patch0: %{name}-%{version}-syslibs.patch # Port of https://github.com/owncloud/client/issues/4239 -Patch1: %{name}-2.1.0-rpath.patch +Patch1: %{name}-%{version}-rpath.patch +Patch2: %{name}-%{version}-shebang.patch BuildRequires: check BuildRequires: cmake @@ -152,6 +153,10 @@ fi %changelog +* Wed Feb 10 2016 Germano Massullo - 2.1.1-1 +- Minor update +- Added shebang patch (https://github.com/owncloud/client/issues/4436) + * Thu Feb 04 2016 Fedora Release Engineering - 2.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 1619c1b..a3e3c20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a92bb1689d2b80ef4f4763af71053a53 owncloudclient-2.1.0.tar.xz +de4b1e6f61d9dd6afd05cd886b98d0ea client-2.1.1.tar.gz