aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbphinz <bphinz@users.sf.net>2014-07-14 17:24:57 -0400
committerbphinz <bphinz@users.sf.net>2014-07-14 17:24:57 -0400
commitdf570bd5a4c22632508f6951a5d4c9c88226f521 (patch)
tree6d462df5e4e4c7c2fd9a9385b6da06b5dad81554
parent51f9a3aafc2008c23cdcbcabf7f271df05d83375 (diff)
parentd7442e25594172744d9d7d95f4dafb955d799c5e (diff)
downloadtigervnc-df570bd5a4c22632508f6951a5d4c9c88226f521.tar.gz
tigervnc-df570bd5a4c22632508f6951a5d4c9c88226f521.zip
Merge pull request #13 from bphinz/master
Remove OpenSuse newfbsize patch
-rw-r--r--contrib/packages/rpm/sle11/SPECS/tigervnc.spec4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
index 4360feba..56127513 100644
--- a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
@@ -71,7 +71,7 @@ Source12: http://downloads.sourceforge.net/project/libjpeg-turbo/1.3.0/lib
# Tiger vnc patches
Patch3: u_tigervnc-1.3.0-fix-use-after-free.patch
-Patch4: tigervnc-newfbsize.patch
+#Patch4: tigervnc-newfbsize.patch
Patch5: tigervnc-clean-pressed-key-on-exit.patch
# Xserver patches
@@ -192,7 +192,7 @@ tar xjf %SOURCE2
cp -r ./xorg-server-*/* unix/xserver/
%patch3 -p1
-%patch4 -p1
+#%patch4 -p1
%patch5 -p1
pushd unix/xserver