[freerdp] Update and enable server

[David Woodhouse]

commit 9d2cae9680057347efd9cd02da20ed2d2d422123
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Fri Mar 13 01:01:30 2015 +0000

    Update and enable server

 .gitignore               |   1 +
 freerdp-aarch64.patch    |  14 ++--
 freerdp-args.patch       | 184 -----------------------------------------------
 freerdp-cmake-list.patch |  79 --------------------
 freerdp.spec             |  31 +++++---
 sources                  |   2 +-
 6 files changed, 31 insertions(+), 280 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 240dee3..ff0badf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /freerdp-1.1.0-beta1.tar.gz
 /freerdp-1.1.0-beta+2013071101.tar.gz
 /1.2.0-beta1+android7.tar.gz
+/1.2.0-beta1+20150313.tar.gz
diff --git a/freerdp-aarch64.patch b/freerdp-aarch64.patch
index a131c2f..ce8f183 100644
--- a/freerdp-aarch64.patch
+++ b/freerdp-aarch64.patch
@@ -1,15 +1,17 @@
---- freerdp-1.1.0-beta+2013071101/cmake/ConfigOptions.cmake.orig	2014-06-07 20:34:55.607853558 +0100
-+++ freerdp-1.1.0-beta+2013071101/cmake/ConfigOptions.cmake	2014-06-07 20:36:29.987547540 +0100
-@@ -6,6 +6,8 @@
+diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake
+index 282659e..6045e31 100644
+--- a/cmake/ConfigOptions.cmake
++++ b/cmake/ConfigOptions.cmake
+@@ -7,6 +7,8 @@ elseif((CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64") AND (CMAKE_SIZEOF_VOID_P
  elseif((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (CMAKE_SIZEOF_VOID_P EQUAL 8) AND (APPLE))
  	# Mac is weird like that.
  	set(TARGET_ARCH "x64")
 +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
 +	set(TARGET_ARCH "AARCH64")
- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm*")
  	set(TARGET_ARCH "ARM")
- endif()
-@@ -19,6 +21,9 @@
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
+@@ -23,6 +25,9 @@ else()
  	option(WITH_SSE2 "Enable SSE2 optimization." OFF)
  endif()
  
diff --git a/freerdp.spec b/freerdp.spec
index c32963a..b35370c 100644
--- a/freerdp.spec
+++ b/freerdp.spec
@@ -1,18 +1,13 @@
 Name:           freerdp
 Version:        1.2.0
-Release:        0.6.beta.1%{?dist}
+Release:        0.7.beta.1%{?dist}
 Epoch:          1
 Summary:        Free implementation of the Remote Desktop Protocol (RDP)
 
 License:        ASL 2.0
 URL:            http://www.freerdp.com/
-Source0:        https://github.com/FreeRDP/FreeRDP/archive/%{version}-beta1+android9.tar.gz
+Source0:        %{version}-beta1+20150313.tar.gz
 Patch0:         freerdp-aarch64.patch
-# https://github.com/FreeRDP/FreeRDP/commit/1b663ceffe51008af7ae9749e5b7999b2f7d6698
-Patch1:         freerdp-cmake-list.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1150349
-# https://github.com/FreeRDP/FreeRDP/pull/2310
-Patch2:         freerdp-args.patch
 
 BuildRequires:  alsa-lib-devel
 BuildRequires:  cmake >= 2.8
@@ -69,6 +64,13 @@ Requires:       cmake >= 2.8
 The %{name}-devel package contains libraries and header files for developing
 applications that use %{name}-libs.
 
+%package        server
+Summary:        Server support for %{name}
+
+%description    server
+The %{name}-server package contains servers which can export a desktop via
+the RDP protocol.
+
 %package -n     libwinpr
 Summary:        Windows Portable Runtime
 Provides:       %{name}-libwinpr = %{?epoch}:%{version}-%{release}
@@ -90,10 +92,8 @@ The %{name}-libwinpr-devel package contains libraries and header files for
 developing applications that use %{name}-libwinpr.
 
 %prep
-%setup -qn FreeRDP-%{version}-beta1-android9
+%setup -qn FreeRDP-%{version}-beta1-20150313
 %patch0 -p1 -b .aarch64
-%patch1 -p1 -b .cmake-list
-%patch2 -p1 -b .args
 
 # Rpmlint fixes
 find . -name "*.h" -exec chmod 664 {} \;
@@ -113,6 +113,7 @@ find . -name "*.h" -exec chmod 664 {} \;
     -DWITH_OPENSSL=ON \
     -DWITH_PCSC=ON \
     -DWITH_PULSE=ON \
+    -DWITH_SERVER=ON \
     -DWITH_X11=ON \
     -DWITH_XCURSOR=ON \
     -DWITH_XEXT=ON \
@@ -168,14 +169,21 @@ find %{buildroot} -name "*.a" -delete
 %{_libdir}/%{name}/
 %{_libdir}/lib%{name}*.so.*
 %{_libdir}/libx%{name}*.so.*
+%{_libdir}/librdtk.so.*
 
 %files devel
 %{_libdir}/cmake/FreeRDP
+%{_libdir}/cmake/RdTk
 %{_includedir}/%{name}
+%{_includedir}/rdtk
 %{_libdir}/lib%{name}*.so
 %{_libdir}/libx%{name}*.so
+%{_libdir}/librdtk.so
 %{_libdir}/pkgconfig/%{name}.pc
 
+%files server
+%{_bindir}/freerdp-shadow
+
 %files -n libwinpr
 %doc LICENSE README ChangeLog
 %{_libdir}/libwinpr*.so.*
@@ -187,6 +195,9 @@ find %{buildroot} -name "*.a" -delete
 %{_libdir}/pkgconfig/winpr.pc
 
 %changelog
+* Fri Mar 13 2015 David Woodhouse <dwmw2 at infradead.org> - 1:1.2.0-0.7.beta.1
+- Update to git snapshot (dfc12385) and enable server build
+
 * Thu Jan 15 2015 Orion Poplawski <orion at cora.nwra.com> - 1:1.2.0-0.6.beta.1
 - Use better upstream patch to fix command line parsing
 
diff --git a/sources b/sources
index a7c3088..fdacd6e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4a0a4f6e69c871aeab0600091ca6118  1.2.0-beta1+android9.tar.gz
+3148ea8fd0420cdf731bb68cc5e03cbb  1.2.0-beta1+20150313.tar.gz