- release 2 (by relup.sh)

[packages/owncloudclient.git] / owncloudclient.spec

diff --git a/owncloudclient.spec b/owncloudclient.spec
index 73f03f1f8aef8e98437a8bd9c9e1b1141ef51abf..38348d224392e6df310b4634c775c1e3a909c876 100644 (file)
--- 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
-Release:       0.17
+Version:       2.3.3
+Release:       2
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       https://download.owncloud.com/desktop/stable/%{name}-%{version}.tar.xz
-# Source0-md5: 63a971158201a8dffe96a02c54b86819
+# Source0-md5: bba20fc6f38e0b14f6ceb9ab432d1802
 Patch0:                syslibs.patch
 URL:           https://www.owncloud.com/
 BuildRequires: Qt5Concurrent-devel >= %{qtver}
@@ -43,8 +45,9 @@ BuildRequires:        xz
 BuildRequires: zlib-devel
 %if %{with gui}
 BuildRequires: Qt5LockedFile-devel >= 2.4
-BuildRequires: Qt5SingleApplication-devel >= 2.6
+BuildRequires: Qt5SingleApplication-devel >= 2.6.1-3
 BuildRequires: Qt5Sql-devel >= %{qtver}
+BuildConflicts:        QtLockedFile-devel
 %endif
 %if %{with dolphin}
 BuildRequires: kf5-attica-devel >= 5.16
@@ -65,6 +68,7 @@ BuildRequires:        texlive-xetex
 %endif
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      Qt5Gui-platform-xcb
+Requires:      Qt5SingleApplication >= 2.6.1-3
 Requires:      desktop-file-utils
 Requires:      gtk-update-icon-cache
 Requires:      hicolor-icon-theme
@@ -133,12 +137,22 @@ 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
 
-rm -r src/3rdparty/qtlockedfile
-rm -r src/3rdparty/qtsingleapplication
+mv src/3rdparty/qtlockedfile .
+mv src/3rdparty/qtsingleapplication .
 
 %build
 install -d build
@@ -182,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
@@ -233,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}