[packages/mirall] add qt4 bcond

glen glen at pld-linux.org
Sat Feb 7 19:58:06 CET 2015


commit f6bc32c8ba4fb93f4dbcb2fdd32df6ca5336970d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Feb 7 18:35:49 2015 +0200

    add qt4 bcond

 mirall.spec | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/mirall.spec b/mirall.spec
index 6f944b0..588db30 100644
--- a/mirall.spec
+++ b/mirall.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_without	qt4		# build Qt4
+
 # TODO:
 # * Fix ocsync packaging for and fix plugin dependencies here
 # * Fix and package lang stuff
@@ -17,13 +21,13 @@ BuildRequires:	cmake >= 2.8
 BuildRequires:	doxygen
 BuildRequires:	kde4-icons-oxygen
 BuildRequires:	libstdc++-devel
-BuildRequires:	qt4-build
-BuildRequires:	qt4-linguist
 %if %{with qt4}
 BuildRequires:	QtGui-devel >= %{qtver}
 BuildRequires:	QtKeychain-devel
 BuildRequires:	QtTest-devel >= %{qtver}
 BuildRequires:	QtWebKit-devel >= %{qtver}
+BuildRequires:	qt4-build
+BuildRequires:	qt4-linguist
 %endif
 Requires:	iproute2
 Requires:	kde4-icons-oxygen
@@ -64,7 +68,8 @@ cd build
 	-DUNIT_TESTING=ON \
 	-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=OFF \
 	-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=OFF \
-	-DBUILD_WITH_QT4=ON \
+	%{!?with_qt4:-DBUILD_LIBRARIES_ONLY=ON} \
+	%{?with_qt4:-DBUILD_WITH_QT4=ON} \
 	..
 
 %{__make}
@@ -75,6 +80,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} -r $RPM_BUILD_ROOT/usr/share/doc/{html,latex}
+
 mv $RPM_BUILD_ROOT%{_libdir}/owncloud/* $RPM_BUILD_ROOT%{_libdir}
 rmdir $RPM_BUILD_ROOT%{_libdir}/owncloud
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mirall.git/commitdiff/51720243e2e3224b188e146599bd25dbe40b569c



More information about the pld-cvs-commit mailing list