[packages/owncloudclient] ensure qt5 version of LockedFile is used for linking

glen glen at pld-linux.org
Wed Apr 13 08:39:01 CEST 2016


commit 1e8786d9a9374d8d2d9dc0734d22005616413933
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Apr 13 09:38:54 2016 +0300

    ensure qt5 version of LockedFile is used for linking

 owncloudclient.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/owncloudclient.spec b/owncloudclient.spec
index 73f03f1..a6e4891 100644
--- a/owncloudclient.spec
+++ b/owncloudclient.spec
@@ -15,7 +15,7 @@
 Summary:	The ownCloud client
 Name:		owncloudclient
 Version:	2.1.1
-Release:	0.17
+Release:	0.21
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	https://download.owncloud.com/desktop/stable/%{name}-%{version}.tar.xz
@@ -43,8 +43,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
@@ -137,8 +138,8 @@ Nautilus file manager.
 %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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/owncloudclient.git/commitdiff/1e8786d9a9374d8d2d9dc0734d22005616413933



More information about the pld-cvs-commit mailing list