[packages/freerdp] add pcsc bcond (currently build broken), builds now

glen glen at pld-linux.org
Wed Oct 24 23:00:14 CEST 2012


commit dd410870083a4a2d381fcb8125409596ef138b87
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Oct 24 23:59:56 2012 +0300

    add pcsc bcond (currently build broken), builds now

 freerdp.spec | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/freerdp.spec b/freerdp.spec
index a55b07c..cfffc59 100644
--- a/freerdp.spec
+++ b/freerdp.spec
@@ -1,3 +1,7 @@
+# Conditional build:
+#
+%bcond_with	pcsc		# SmartCard support via PCSC-lite library
+
 Summary:	Remote Desktop Protocol client
 Name:		freerdp
 Version:	1.0.1
@@ -10,7 +14,7 @@ BuildRequires:	cmake
 BuildRequires:	cups-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	openssl-devel
-BuildRequires:	pcsc-lite-devel
+%{?with_pcsc:BuildRequires:	pcsc-lite-devel}
 BuildRequires:	pulseaudio-devel
 BuildRequires:	xmlto
 BuildRequires:	xorg-lib-libX11-devel
@@ -32,7 +36,7 @@ project.
 xfreerdp can connect to RDP servers such as Microsoft Windows
 machines, xrdp and VirtualBox.
 
-%package        libs
+%package libs
 Summary:	Core libraries implementing the RDP protocol
 Group:		Applications/Communications
 
@@ -44,7 +48,7 @@ applications together with libfreerdp-core.
 
 libfreerdp-core can be extended with plugins handling RDP channels.
 
-%package        plugins
+%package plugins
 Summary:	Plugins for handling the standard RDP channels
 Group:		Applications/Communications
 Requires:	%{name}-libs = %{version}-%{release}
@@ -54,7 +58,7 @@ A set of plugins to the channel manager implementing the standard
 virtual channels extending RDP core functionality. For instance,
 sounds, clipboard sync, disk/printer redirection, etc.
 
-%package        devel
+%package devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
@@ -83,7 +87,7 @@ install -d build
 cd build
 %cmake \
 	-DWITH_CUPS=ON \
-	-DWITH_PCSC=ON \
+	%{?with_pcsc:-DWITH_PCSC=ON} \
 	-DWITH_PULSEAUDIO=ON \
 	-DWITH_X11=ON \
 	-DWITH_XCURSOR=ON \
@@ -103,7 +107,7 @@ cd build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C build install \
 	INSTALL="install -p" \
 	DESTDIR=$RPM_BUILD_ROOT
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/freerdp.git/commitdiff/dd410870083a4a2d381fcb8125409596ef138b87



More information about the pld-cvs-commit mailing list