[x2goserver] - Update to 4.0.1.9 - Drop incorrect keyboard patch

Orion Poplawski orion at fedoraproject.org
Mon Dec 2 22:33:47 UTC 2013


commit 5d6738da376d81655e60f5fac78ca4a751e626f9
Author: Orion Poplawski <orion at nwra.com>
Date:   Mon Dec 2 15:33:44 2013 -0700

    - Update to 4.0.1.9
    - Drop incorrect keyboard patch

 .gitignore                |    1 +
 sources                   |    2 +-
 x2goserver-keyboard.patch |   12 ------------
 x2goserver.spec           |   12 ++++++------
 4 files changed, 8 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 667850e..ce856cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /x2goserver-4.0.1.6.tar.gz
 /x2goserver-4.0.1.8.tar.gz
+/x2goserver-4.0.1.9.tar.gz
diff --git a/sources b/sources
index 0d65691..81597b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-754ee94f2b4b57fc08973027a174cf81  x2goserver-4.0.1.8.tar.gz
+149fa59d130b1b57a39ee06e5e7fbac0  x2goserver-4.0.1.9.tar.gz
diff --git a/x2goserver.spec b/x2goserver.spec
index 8e49aab..cd4ea85 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -1,7 +1,7 @@
 #global checkout 20130722git65169c9
 Name:           x2goserver
-Version:        4.0.1.8
-Release:        2%{?dist}
+Version:        4.0.1.9
+Release:        1%{?dist}
 Summary:        X2Go server daemon scripts
 
 Group:          Applications/Communications
@@ -19,9 +19,6 @@ Source2:        x2gocleansessions.init
 Patch0:         x2goserver-pwgen.patch
 # Use mktemp instead of tempfile
 Patch1:         x2goserver-mktemp.patch
-# Fix keyboard setting
-# https://bugzilla.redhat.com/show_bug.cgi?id=1033876
-Patch2:		x2goserver-keyboard.patch
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
 %if 0%{?fedora}
@@ -89,7 +86,6 @@ server).
 %setup -q
 %patch0 -p1 -b .pwgen
 %patch1 -p1 -b .mktemp
-%patch2 -p1 -b .keyboard
 
 # Set pach
 #find -type f | xargs sed -i -r -e '/^((LIBDIR|X2GO_LIB_PATH)=|use lib|my \$x2go_lib_path)/s,/lib/,/%{_lib}/,'
@@ -230,6 +226,10 @@ exit 0
 %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint
 
 %changelog
+* Mon Dec 2 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.9-1
+- Update to 4.0.1.9
+- Drop incorrect keyboard patch
+
 * Wed Nov 27 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.8-2
 - Use mktemp instead of tempfile
 - BR xorg-x11-xinit for Xsession.d link creation


More information about the scm-commits mailing list