rpms/tigervnc/devel tigervnc-102434.patch, 1.1, 1.2 tigervnc.spec, 1.43, 1.44 tigervnc11-ldnow.patch, 1.1, 1.2 vncviewer.desktop, 1.2, 1.3 tigervnc11-libvnc.patch, 1.1, NONE tigervnc11-options.patch, 1.1, NONE tigervnc11-rh586406.patch, 1.1, NONE tigervnc11-rh597172.patch, 1.1, NONE tigervnc11-rh600070.patch, 1.1, NONE

Adam Tkac atkac at fedoraproject.org
Thu Jul 22 09:15:20 UTC 2010 

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16684

Modified Files:
	tigervnc-102434.patch tigervnc.spec tigervnc11-ldnow.patch 
	vncviewer.desktop 
Removed Files:
	tigervnc11-libvnc.patch tigervnc11-options.patch 
	tigervnc11-rh586406.patch tigervnc11-rh597172.patch 
	tigervnc11-rh600070.patch 
Log Message:
- update to r4113
- patches merged
  - tigervnc11-rh586406.patch
  - tigervnc11-libvnc.patch
  - tigervnc11-rh597172.patch
  - tigervnc11-rh600070.patch
  - tigervnc11-options.patch
- don't own %%{_datadir}/icons directory (#614301)
- minor improvements in the .desktop file (#616340)


tigervnc-102434.patch:
 CConn.cxx     |   11 +++++++++++
 parameters.h  |    1 +
 vncviewer.cxx |    2 +-
 vncviewer.man |    5 +++++
 4 files changed, 18 insertions(+), 1 deletion(-)

Index: tigervnc-102434.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc-102434.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tigervnc-102434.patch	3 Mar 2009 21:02:04 -0000	1.1
+++ tigervnc-102434.patch	22 Jul 2010 09:15:18 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx.102434 tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx
---- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx.102434	2008-10-10 17:48:22.000000000 +0200
-+++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx	2008-10-22 18:35:46.000000000 +0200
-@@ -37,6 +37,8 @@
+diff -up tigervnc-1.0.90-20100721svn4113/unix/vncviewer/CConn.cxx.102434 tigervnc-1.0.90-20100721svn4113/unix/vncviewer/CConn.cxx
+--- tigervnc-1.0.90-20100721svn4113/unix/vncviewer/CConn.cxx.102434	2010-07-20 17:07:44.000000000 +0200
++++ tigervnc-1.0.90-20100721svn4113/unix/vncviewer/CConn.cxx	2010-07-21 17:02:09.900085594 +0200
+@@ -40,6 +40,8 @@
  #include "ServerDialog.h"
  #include "PasswdDialog.h"
  #include "parameters.h"
@@ -10,26 +10,26 @@ diff -up tightvnc-1.5.0-20081015svn3022/
  
  using namespace rfb;
  
-@@ -209,6 +211,15 @@ void CConn::getUserPasswd(char** user, c
+@@ -214,6 +216,15 @@ void CConn::getUserPasswd(char** user, c
      return;
    }
  
 +  /* XXX Who wrote this code? Yes, it is really ugly */
 +  if (passwdInput) {
-+    std::string s;
-+    std::cin >> s;
-+    *password = strdup(s.c_str());
-+    if(user) *user = 0;
-+      return;
++   std::string s;
++   std::cin >> s;
++   *password = strdup(s.c_str());
++   if (user) *user = 0;
++     return;
 +  }
 +
-   const char* secType = secTypeName(getCurrentCSecurity()->getType());
+   const char* secType = secTypeName(csecurity->getType());
    const char* titlePrefix = _("VNC authentication");
    unsigned int titleLen = strlen(titlePrefix) + strlen(secType) + 4;
-diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h.102434 tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h
---- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h.102434	2006-05-18 13:08:21.000000000 +0200
-+++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h	2008-10-22 18:08:47.000000000 +0200
-@@ -41,6 +41,7 @@ extern rfb::BoolParameter customCompress
+diff -up tigervnc-1.0.90-20100721svn4113/unix/vncviewer/parameters.h.102434 tigervnc-1.0.90-20100721svn4113/unix/vncviewer/parameters.h
+--- tigervnc-1.0.90-20100721svn4113/unix/vncviewer/parameters.h.102434	2009-03-23 17:49:47.000000000 +0100
++++ tigervnc-1.0.90-20100721svn4113/unix/vncviewer/parameters.h	2010-07-21 16:55:44.414314911 +0200
+@@ -42,6 +42,7 @@ extern rfb::BoolParameter customCompress
  extern rfb::IntParameter compressLevel;
  extern rfb::BoolParameter noJpeg;
  extern rfb::IntParameter qualityLevel;
@@ -37,21 +37,22 @@ diff -up tightvnc-1.5.0-20081015svn3022/
  
  extern char aboutText[];
  extern char* programName;
-diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx.102434 tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx
---- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx.102434	2008-09-28 07:08:48.000000000 +0200
-+++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx	2008-10-22 18:04:00.000000000 +0200
-@@ -58,6 +58,7 @@ IntParameter wmDecorationHeight("WMDecor
-                                 "manager decoration around a window", 24);
+diff -up tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.cxx.102434 tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.cxx
+--- tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.cxx.102434	2010-04-23 16:06:38.000000000 +0200
++++ tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.cxx	2010-07-21 17:01:05.979161234 +0200
+@@ -59,7 +59,7 @@ IntParameter wmDecorationHeight("WMDecor
  StringParameter passwordFile("PasswordFile",
                               "Password file for VNC authentication", "");
+ AliasParameter passwd("passwd", "Alias for PasswordFile", &passwordFile);
+-
 +BoolParameter passwdInput("passwdInput", "Gets password from stdin", false);
- AliasParameter rfbauth("passwd", "Alias for PasswordFile", &passwordFile);
- 
  BoolParameter useLocalCursor("UseLocalCursor",
-diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man.102434 tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man
---- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man.102434	2006-06-02 06:43:52.000000000 +0200
-+++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man	2008-10-22 18:04:00.000000000 +0200
-@@ -115,6 +115,11 @@ the server, you can specify it here to a
+                              "Render the mouse cursor locally", true);
+ BoolParameter dotWhenNoCursor("DotWhenNoCursor",
+diff -up tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.man.102434 tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.man
+--- tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.man.102434	2009-10-07 17:13:00.000000000 +0200
++++ tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.man	2010-07-21 16:55:44.414314911 +0200
+@@ -119,6 +119,11 @@ the server, you can specify it here to a
  "~/.vnc/passwd".
  
  .TP


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- tigervnc.spec	2 Jul 2010 13:20:32 -0000	1.43
+++ tigervnc.spec	22 Jul 2010 09:15:19 -0000	1.44
@@ -1,8 +1,8 @@
-%define snap 20100420svn4030
+%define snap 20100721svn4113
 
 Name:		tigervnc
 Version:	1.0.90
-Release:	0.16.%{snap}%{?dist}
+Release:	0.17.%{snap}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -25,8 +25,9 @@ BuildRequires:  freetype-devel, libXdmcp
 BuildRequires:	desktop-file-utils, java-1.5.0-gcj-devel
 BuildRequires:	libjpeg-turbo-devel
 
-Requires(post):	coreutils	
-Requires(postun):coreutils	
+Requires(post):	coreutils
+Requires(postun):coreutils
+Requires: hicolor-icon-theme
 
 Provides:	vnc = 4.1.3-2, vnc-libs = 4.1.3-2
 Obsoletes:	vnc < 4.1.3-2, vnc-libs < 4.1.3-2
@@ -36,12 +37,7 @@ Obsoletes:	tightvnc < 1.5.0-0.15.2009020
 Patch0:		tigervnc-102434.patch
 Patch4:		tigervnc-cookie.patch
 Patch8:		tigervnc-viewer-reparent.patch
-Patch9:		tigervnc11-rh586406.patch
 Patch10:	tigervnc11-ldnow.patch
-Patch11:	tigervnc11-libvnc.patch
-Patch12:	tigervnc11-rh597172.patch
-Patch13:	tigervnc11-rh600070.patch
-Patch14:	tigervnc11-options.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -104,19 +100,14 @@ clients to use web browser when connect 
 %patch0 -p1 -b .102434
 %patch4 -p1 -b .cookie
 %patch8 -p1 -b .viewer-reparent
-%patch9 -p1 -b .rh586406
 %patch10 -p1 -b .ldnow
-%patch11 -p1 -b .libvnc
-%patch12 -p1 -b .rh597172
-%patch13 -p1 -b .rh600070
-%patch14 -p1 -b .options
 
 cp -r /usr/share/xorg-x11-server-source/* unix/xserver
 pushd unix/xserver
 for all in `find . -type f -perm -001`; do
 	chmod -x "$all"
 done
-patch -p1 -b --suffix .vnc < ../xserver18.patch
+patch -p1 -b --suffix .vnc < ../xserver19.patch
 popd
 
 # Use newer gettext
@@ -129,7 +120,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-omit-
 export CXXFLAGS="$CFLAGS"
 
 autoreconf -fiv
-%configure --disable-static --with-system-jpeg
+%configure --disable-static --with-system-jpeg --disable-gnutls
 
 make %{?_smp_mflags}
 
@@ -242,7 +233,7 @@ fi
 %defattr(-,root,root,-)
 %doc LICENCE.TXT unix/README
 %{_bindir}/vncviewer
-%{_datadir}/icons/*
+%{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/applications/*
 %{_mandir}/man1/vncviewer.1*
 
@@ -273,6 +264,17 @@ fi
 %{_datadir}/vnc/classes/*
 
 %changelog
+* Thu Jul 22 2010 Adam Tkac <atkac redhat com> 1.0.90-0.17.20100721svn4113
+- update to r4113
+- patches merged
+  - tigervnc11-rh586406.patch
+  - tigervnc11-libvnc.patch
+  - tigervnc11-rh597172.patch
+  - tigervnc11-rh600070.patch
+  - tigervnc11-options.patch
+- don't own %%{_datadir}/icons directory (#614301)
+- minor improvements in the .desktop file (#616340)
+
 * Fri Jul 02 2010 Adam Tkac <atkac redhat com> 1.0.90-0.16.20100420svn4030
 - build against system-wide libjpeg-turbo (#494458)
 - build no longer requires nasm

tigervnc11-ldnow.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: tigervnc11-ldnow.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc11-ldnow.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tigervnc11-ldnow.patch	13 May 2010 11:37:58 -0000	1.1
+++ tigervnc11-ldnow.patch	22 Jul 2010 09:15:19 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up tigervnc-1.0.90-20100420svn4030/unix/xserver/hw/vnc/Makefile.am.ldnow tigervnc-1.0.90-20100420svn4030/unix/xserver/hw/vnc/Makefile.am
---- tigervnc-1.0.90-20100420svn4030/unix/xserver/hw/vnc/Makefile.am.ldnow	2010-05-10 13:55:28.484322693 +0200
-+++ tigervnc-1.0.90-20100420svn4030/unix/xserver/hw/vnc/Makefile.am	2010-05-10 13:55:37.574320863 +0200
+diff -up tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am.ldnow tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am
+--- tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am.ldnow	2010-05-18 15:48:02.000000000 +0200
++++ tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am	2010-07-21 17:05:45.242942531 +0200
 @@ -50,7 +50,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
  	-I$(top_srcdir)/hw/xfree86/os-support/bus \
  	-I$(includedir)/pixman-1 -I$(includedir)
@@ -8,5 +8,5 @@ diff -up tigervnc-1.0.90-20100420svn4030
 -libvnc_la_LDFLAGS = -module -avoid-version
 +libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
  
- libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(LIBVNC_LIBS)
+ libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
  


Index: vncviewer.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/vncviewer.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vncviewer.desktop	12 Mar 2010 15:31:15 -0000	1.2
+++ vncviewer.desktop	22 Jul 2010 09:15:19 -0000	1.3
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=TigerVNC Viewer
 Name[fr]=Visionneur TigerVNC
 Comment=Connect to VNC server and display remote desktop
@@ -9,4 +8,4 @@ Icon=tigervnc
 Terminal=false
 Type=Application
 StartupWMClass=TigerVNC Viewer: Connection Details
-Categories=Network;Application;
+Categories=Network;RemoteAccess;


--- tigervnc11-libvnc.patch DELETED ---


--- tigervnc11-options.patch DELETED ---


--- tigervnc11-rh586406.patch DELETED ---


--- tigervnc11-rh597172.patch DELETED ---


--- tigervnc11-rh600070.patch DELETED ---

More information about the scm-commits mailing list