openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package freerdp1

--- freerdp.changes.orig
+++ freerdp.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue Oct  7 08:00:04 UTC 2014 - hpj@urpla.net
+
+- apply current 1.0 branch of upstream git (as of 20140210)
+- adjust my multi monitor patches
+
+-------------------------------------------------------------------
 Mon Jun 23 03:05:37 UTC 2014 - fezhang@suse.com
 
 - Add freerdp-CVE-2014-0791.patch to fix bnc#857491
@@ -26,6 +32,21 @@ Thu Sep 12 07:03:02 UTC 2013 - crrodrigu
  the application respects the system's openSSL configuration.
 
 -------------------------------------------------------------------
+Sat May  4 10:41:57 UTC 2013 - hpj@urpla.net
+
+- fix plugin recommendation, update man page
+
+-------------------------------------------------------------------
+Mon Apr 29 20:05:53 UTC 2013 - hpj@urpla.net
+
+- add patches to handle multimon setups
+
+-------------------------------------------------------------------
+Tue Apr 23 09:06:13 UTC 2013 - hpj@urpla.net
+
+- apply fix to avoid crash, when using smartcards
+
+-------------------------------------------------------------------
 Thu Mar  7 09:10:15 UTC 2013 - bruno@ioda-net.ch
 
 - Added patch for issue #811 fixing divide key (/) on keypad for 1.0x series
--- freerdp.spec.orig
+++ freerdp.spec
@@ -19,34 +19,35 @@
 %define libname libfreerdp-1_0
 
 Name:           freerdp
-Version:        1.0.2
+Version:        1.0.3.0.git20140210
 Release:        0
 Summary:        Remote Desktop Viewer Client
 License:        Apache-2.0
 Group:          Productivity/Networking/Other
 Url:            http://www.freerdp.com/
-Source0:        https://github.com/downloads/FreeRDP/FreeRDP/%{name}-%{version}.tar.gz
+Source0:        https://github.com/downloads/FreeRDP/FreeRDP/%{name}-%{version}.tar.bz2
 Source1:        FindALSA.cmake
 # PATCH-FIX-UPSTREAM freerdp-fix-FindPCSC-macro.patch https://github.com/FreeRDP/FreeRDP/issues/562 gberh@opensuse.org -- Fix the build by setting PCSC_LIBRARIES and PCSC_INCLUDE_DIRS variables explicitly which are otherwise empty
 Patch1:         freerdp-fix-FindPCSC-macro.patch
 # PATCH-FIX-UPSTREAM freerdp-fix-pulse-no-device-name.patch bnc#785437 gber@opensuse.org -- Fix a segfault in case device name is not provided
 Patch4:         freerdp-handle-null-device-name.patch
-# PATCH-FIX-UPSTREAM (wip) fix handle of kpdivide on keypad - issue #831
-Patch5:         freerdp_branch-1.0.x_fix-kpdivide-issue831.patch
 # PATCH-FIX-UPSTREAM freerdp-CVE-2014-0250.patch bnc#880317 dliang@suse.com - backport from upstream 
 Patch6:         freerdp-CVE-2014-0250.patch
 Patch7:         freerdp-CVE-2014-0791.patch
+# patch to avoid crashes, when smartcards are used
+Patch10:        freerdp_branch-1.0.x_smartcard-crash-fix.patch
+Patch11:        freerdp_branch-1.0.x_extend-geom-argument-with-position.patch
+Patch12:        freerdp_branch-1.0.x_provide-correct-multi-monitor-data.patch
 BuildRequires:  alsa-devel
 BuildRequires:  cmake
 BuildRequires:  cups-devel
-BuildRequires:  ed
 BuildRequires:  libopenssl-devel
 BuildRequires:  libpulse-devel
 BuildRequires:  pcsc-lite-devel
 BuildRequires:  xmlto
 BuildRequires:  xorg-x11-devel
 BuildRequires:  zlib-devel
-Recommends:     libfreerdp-plugins
+Recommends:     %{libname}-plugins
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -82,18 +83,17 @@ This package contains development files
 based on libfreerdp.
 
 %prep
-%setup -q -n FreeRDP-%{version}
+%setup -q -n freerdp-%{version}
 %patch1 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 # use a versioned subdirectory for plugins in order to comply with the shared
 # library policy
-ed -s CMakeLists.txt 2>/dev/null <<'EOF'
-,s/FREERDP_PLUGIN_PATH "\${CMAKE_INSTALL_PREFIX}\/\${CMAKE_INSTALL_LIBDIR}\/freerdp"/FREERDP_PLUGIN_PATH "\${CMAKE_INSTALL_PREFIX}\/\${CMAKE_INSTALL_LIBDIR}\/%{libname}"/
-w
-EOF
+sed -i 's/FREERDP_PLUGIN_PATH "\${CMAKE_INSTALL_PREFIX}\/\${CMAKE_INSTALL_LIBDIR}\/freerdp"/FREERDP_PLUGIN_PATH "\${CMAKE_INSTALL_PREFIX}\/\${CMAKE_INSTALL_LIBDIR}\/%{libname}"/g' CMakeLists.txt
 %if 0%{?sles_version} == 11
     cp %SOURCE1 cmake/
 %endif
@@ -114,6 +114,7 @@ cmake \
 %ifarch %ix86 x86_64
     -DWITH_SSE2=ON \
 %endif
+    -DWITH_DEBUG_X11_MONITOR=ON \
     ..
 make %{?_smp_mflags} VERBOSE=1

Places

File project.diff of Package freerdp1

Places