Accepting request 396177 from home:zhangxiaofei:branches:X11:RemoteDesktop

add obs source integratoin; update to upstream HEAD

OBS-URL: https://build.opensuse.org/request/show/396177
OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/freerdp?expand=0&rev=48

_service

@@ -0,0 +1,15 @@
+<services>
+  <service name="tar_scm" mode="disabled">
+    <param name="scm">git</param>
+    <param name="url">https://github.com/FreeRDP/FreeRDP.git</param>
+    <param name="filename">freerdp</param>
+    <param name="versionprefix">2.0.0git</param>
+    <param name="changesgenerate">enable</param>
+    <param name="revision">refs/heads/master</param>
+  </service>
+  <service name="recompress" mode="disabled">
+    <param name="file">*.tar</param>
+    <param name="compression">gz</param>
+  </service>
+  <service name="set_version" mode="disabled"/>
+</services>

_servicedata

@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+            <param name="url">https://github.com/FreeRDP/FreeRDP.git</param>
+          <param name="changesrevision">4e66df7228b14e432a0793d32ac2524d37cb88ec</param></service></servicedata>

freerdp-2.0.0git.1463131968.4e66df7.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c8f77b0bb0c4dc2eb96dc4b6385b8c5b89fbefe25c5eb72e3c8adede02b1e80
+size 6511546

freerdp-2.0.0git.a7ca42e.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7afdfa199247eaef1e7d5741fd26ccd5642e0cc1916fcbeaaf8ddf27f56d36cc
-size 6538704

freerdp.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue May 17 10:25:00 UTC 2016 - fezhang@suse.com
+
+- Add obs git integration.
+- Update to version 2.0.0git.1463131968.4e66df7:
+  + Fixed memory leaks.
+  + wfreerdp: fix name build without client interface
+  + libfreerdp-codec: fix xcrush decompression, revert remote control fix
+  + KB3153731: May 2016 DST update for Azerbaijan, Chile, Haiti and Morocco
+  + libfreerdp-codec: make proper xcrush context reset fix
+
 -------------------------------------------------------------------
 Wed May  4 12:06:22 UTC 2016 - fezhang@suse.com
 
@@ -8,13 +19,12 @@ Wed May  4 12:06:22 UTC 2016 - fezhang@suse.com
   * Warning: For xfreerdp, new /long-option commandline interfaces
     have replaced the old --long-option interfaces. Existing user
     scripts need to migrate to the new interfaces to avoid breakages.
-    See more details at 
+    For more details, see:
     https://github.com/FreeRDP/FreeRDP/wiki/CommandLineInterface
-  * Added Network Level Ahthentication support.
+  * Add Network Level Ahthentication support.
-  * freerdp-libfreerdp-1_0 and freerdp-libfreerdp-1_0-plugins are
+  * Add Windows Portable Runtime. For more details, see:
-    deprecated and merged into freerdp-devel.
-  * Added Windows Portable Runtime. for more details see
     http://www.freerdp.com/2012/05/24/winpr-windows-portable-runtime
+  * Drop freerdp-libfreerdp-1_0-plugins.
 - Drop FindALSA.cmake: deprecated
 - Drop freerdp_branch-1.0.x_fix-kpdivide-issue831.patch:
   fixed upstream, implemention now in include/freerdp/scancode.h.

freerdp.spec

@@ -16,14 +16,16 @@
 #
 
 
+%define libname  libfreerdp-2_0
+
 Name:           freerdp
-Version:        2.0.0git.a7ca42e
+Version:        2.0.0git.1463131968.4e66df7
 Release:        0
 Summary:        Remote Desktop Viewer Client
 License:        Apache-2.0
 Group:          Productivity/Networking/Other
 Url:            http://www.freerdp.com/
-Source0:        freerdp-2.0.0git.a7ca42e.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 BuildRequires:  alsa-devel
 BuildRequires:  cmake
 BuildRequires:  cups-devel
@@ -47,60 +49,84 @@ FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
 following the Microsoft Open Specifications. This package provides the client
 application.
 
+%package -n %{libname}
+Summary:        Remote Desktop Viewer Library
+Group:          System/Libraries
+
+%description -n %{libname}
+FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
+following the Microsoft Open Specifications. This package provides the shared
+library.
+
 %package devel
 Summary:        Development Files for %{name}
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
+Requires:       %{libname} = %{version}
-Provides:       libfreerdp-1_0
-Provides:       libfreerdp-1_0-plugins
 
 %description devel
 This package contains development files necessary for developing applications
 based on libfreerdp.
 
 %prep
-%setup -q -n FreeRDP-%{version}
+%setup -q -n %{name}-%{version}
 
 %build
 %cmake \
-    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=%{_prefix} \
     -DCMAKE_INSTALL_LIBDIR=%{_lib} \
-    -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+    -DCMAKE_BUILD_TYPE=Release \
     -DWITH_ALSA=ON \
-    -DWITH_CUPS=ON \
-    -DWITH_FFMPEG=OFF \
-    -DWITH_PCSC=ON \
     -DWITH_PULSEAUDIO=ON \
+    -DWITH_PCSC=ON \
+    -DWITH_CUPS=ON \
+    -DCMAKE_NO_BUILTIN_CHRPATH=ON \
 %ifarch %ix86 x86_64
     -DWITH_SSE2=ON \
 %endif
     ..
-make %{?_smp_mflags}
+make %{?_smp_mflags} VERBOSE=1
 
 %install
 cd build
 make install 'DESTDIR=%{buildroot}'
 find %{buildroot} -name "*.a" -delete
-
 %fdupes -s %{buildroot}
 
-%post   -p /sbin/ldconfig
+%post   -n %{libname} -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
 %doc LICENSE README ChangeLog
-%{_bindir}/*
+%{_bindir}/winpr-hash
-%{_libdir}/*.so.*
+%{_bindir}/winpr-makecert
+%{_bindir}/xfreerdp
 %{_mandir}/man1/xfreerdp.1%{ext_man}
 
+%files -n %{libname}
+%defattr(-,root,root)
+%doc LICENSE
+%{_libdir}/libfreerdp-client.so.*
+%{_libdir}/libfreerdp.so.*
+%{_libdir}/libwinpr.so.*
+%{_libdir}/libwinpr-tools.so.*
+
 %files devel
 %defattr(-,root,root)
-%{_includedir}/*
+%doc LICENSE
-%{_libdir}/*.so
+%{_includedir}/freerdp2
-%{_libdir}/cmake/*
+%{_includedir}/winpr2
-%{_libdir}/pkgconfig/*
+%{_libdir}/cmake/FreeRDP2
+%{_libdir}/cmake/FreeRDP-Client2
+%{_libdir}/cmake/WinPR2
+%{_libdir}/libfreerdp-client.so
+%{_libdir}/libfreerdp.so
+%{_libdir}/libwinpr.so
+%{_libdir}/libwinpr-tools.so
+%{_libdir}/pkgconfig/freerdp2.pc
+%{_libdir}/pkgconfig/freerdp-client2.pc
+%{_libdir}/pkgconfig/winpr2.pc
+%{_libdir}/pkgconfig/winpr-tools2.pc
 
 %changelog