[packages/owncloudclient] updated to 2.3.2 added caja subpackage rel 1

Sun Sep 24 19:54:32 CEST 2017

commit 461d7e6d62d57c6e15cd50f0f31225dc0a950070
Author: Jaroslaw Kruk <kruk.jaroslaw at gmail.com>
Date:   Sun Sep 24 19:52:38 2017 +0200

    updated to 2.3.2
    added caja subpackage
    rel 1

 owncloudclient.spec | 26 ++++++++++++++++++++++----
 syslibs.patch       | 37 ++++++++++++++++++-------------------
 2 files changed, 40 insertions(+), 23 deletions(-)
---

diff --git a/owncloudclient.spec b/owncloudclient.spec
index d60f078..d66c283 100644
--- a/owncloudclient.spec
+++ b/owncloudclient.spec
@@ -1,12 +1,14 @@
 #
 # Conditional build:
 %bcond_without	nautilus	# build Nautilus extension
+%bcond_without	caja		# build caja extension
 %bcond_with	dolphin		# build dolphin extension
 %bcond_without	doc		# build docs
 %bcond_without	gui		# build only libraries
 
 %if %{without gui}
 %undefine	with_nautilus
+%undefine	with_caja
 %undefine	with_dolphin
 %undefine	with_doc
 %endif
@@ -14,12 +16,12 @@
 %define		qtver	5.4
 Summary:	The ownCloud client
 Name:		owncloudclient
-Version:	2.1.1
+Version:	2.3.2
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	https://download.owncloud.com/desktop/stable/%{name}-%{version}.tar.xz
-# Source0-md5:	63a971158201a8dffe96a02c54b86819
+# Source0-md5:	8ce2442fb0528f224e97166baee2bae1
 Patch0:		syslibs.patch
 URL:		https://www.owncloud.com/
 BuildRequires:	Qt5Concurrent-devel >= %{qtver}
@@ -135,6 +137,16 @@ Requires:	nautilus-python
 This package provides overlay icons to visualize the sync state in the
 Nautilus file manager.
 
+%package caja
+Summary:	Caja overlay icons
+Group:		Applications
+Requires:	%{name} = %{version}-%{release}
+Requires:	caja-python
+
+%description caja
+This package provides overlay icons to visualize the sync state in the
+Caja file manager.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -184,7 +196,7 @@ mv $RPM_BUILD_ROOT%{_libdir}/owncloud/libocsync.so* $RPM_BUILD_ROOT%{_libdir}
 
 %if %{with nautilus}
 # nemo not in pld
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/nemo-python/extensions/syncstate.py*
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/nemo-python/extensions/syncstate-ownCloud.py*
 %endif
 
 %clean
@@ -235,7 +247,13 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with nautilus}
 %files nautilus
 %defattr(644,root,root,755)
-%{_datadir}/nautilus-python/extensions/syncstate.py*
+%{_datadir}/nautilus-python/extensions/syncstate-ownCloud.py*
+%endif
+
+%if %{with caja}
+%files caja
+%defattr(644,root,root,755)
+%{_datadir}/caja-python/extensions/syncstate-ownCloud.py*
 %endif
 
 %if %{with doc}
diff --git a/syslibs.patch b/syslibs.patch
index cd81824..bf64a0e 100644
--- a/syslibs.patch
+++ b/syslibs.patch
@@ -1,6 +1,6 @@
-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
+diff -urN owncloudclient-2.3.2.orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h owncloudclient-2.3.2/src/3rdparty/qtsingleapplication/qtlocalpeer.h
+--- owncloudclient-2.3.2.orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h	2017-05-08 15:53:10.000000000 +0200
++++ owncloudclient-2.3.2/src/3rdparty/qtsingleapplication/qtlocalpeer.h	2017-09-24 18:51:19.521537368 +0200
 @@ -27,7 +27,7 @@
  **
  ****************************************************************************/
@@ -10,10 +10,10 @@ diff -urNr client-2.1.1-orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h clie
  
  #include <QLocalServer>
  #include <QLocalSocket>
-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 @@
+diff -urN owncloudclient-2.3.2.orig/src/gui/application.cpp owncloudclient-2.3.2/src/gui/application.cpp
+--- owncloudclient-2.3.2.orig/src/gui/application.cpp	2017-05-08 15:53:10.000000000 +0200
++++ owncloudclient-2.3.2/src/gui/application.cpp	2017-09-24 18:51:19.521537368 +0200
+@@ -95,7 +95,7 @@
  // ----------------------------------------------------------------------------------
  
  Application::Application(int &argc, char **argv) :
@@ -22,9 +22,9 @@ diff -urNr client-2.1.1-orig/src/gui/application.cpp client-2.1.1/src/gui/applic
      _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
+diff -urN owncloudclient-2.3.2.orig/src/gui/application.h owncloudclient-2.3.2/src/gui/application.h
+--- owncloudclient-2.3.2.orig/src/gui/application.h	2017-05-08 15:53:10.000000000 +0200
++++ owncloudclient-2.3.2/src/gui/application.h	2017-09-24 18:51:19.521537368 +0200
 @@ -22,7 +22,7 @@
  #include <QElapsedTimer>
  #include <QNetworkConfigurationManager>
@@ -43,21 +43,21 @@ diff -urNr client-2.1.1-orig/src/gui/application.h client-2.1.1/src/gui/applicat
  {
      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 @@
+diff -urN owncloudclient-2.3.2.orig/src/gui/CMakeLists.txt owncloudclient-2.3.2/src/gui/CMakeLists.txt
+--- owncloudclient-2.3.2.orig/src/gui/CMakeLists.txt	2017-05-08 15:53:10.000000000 +0200
++++ owncloudclient-2.3.2/src/gui/CMakeLists.txt	2017-09-24 18:46:18.975280419 +0200
+@@ -147,10 +147,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 @@
+ if (APPLE)
+@@ -161,18 +157,10 @@
          )
  endif()
  
@@ -68,7 +68,6 @@ diff -urNr client-2.1.1-orig/src/gui/CMakeLists.txt client-2.1.1/src/gui/CMakeLi
 -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
@@ -77,7 +76,7 @@ diff -urNr client-2.1.1-orig/src/gui/CMakeLists.txt client-2.1.1/src/gui/CMakeLi
      )
  
  include_directories(${3rdparty_INC})
-@@ -281,6 +269,8 @@
+@@ -298,6 +286,8 @@
  target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
  target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
  target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/owncloudclient.git/commitdiff/461d7e6d62d57c6e15cd50f0f31225dc0a950070

