rpms/tigervnc/devel vncserver.init, NONE, 1.1 vncserver.sysconfig, NONE, 1.1 vncviewer.desktop, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tigervnc.spec, 1.1, 1.2 tigervnc-clipboard.patch, 1.1, NONE tigervnc-rh212985.patch, 1.1, NONE tigervnc-xclients.patch, 1.1, NONE

Fri Apr 3 17:08:19 UTC 2009

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15012

Modified Files:
	.cvsignore sources tigervnc.spec 
Added Files:
	vncserver.init vncserver.sysconfig vncviewer.desktop 
Removed Files:
	tigervnc-clipboard.patch tigervnc-rh212985.patch 
	tigervnc-xclients.patch 
Log Message:
- update to r3751
- patches merged
  - tigervnc-xclients.patch
  - tigervnc-clipboard.patch
  - tigervnc-rh212985.patch
- basic RandR support in Xvnc (resize of the desktop)
- use built-in libjpeg (SSE2/MMX accelerated encoding on x86 platform)
- use Tight encoding by default
- use TigerVNC icons

--- NEW FILE vncserver.init ---
#!/bin/bash
#
# chkconfig: - 91 35
# description: Starts and stops vncserver. \
#	       used to provide remote X administration services.

### BEGIN INIT INFO
# Provides: vncserver
# Required-Start: $network $named
# Required-Stop: $network $named
# Default-Start:
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: start|stop|restart|try-restart|status|force-reload vncserver
# Description: control vncserver which exports your desktop
### END INIT INFO

# Source function library.
. /etc/init.d/functions

[ -r /etc/sysconfig/vncservers ] && . /etc/sysconfig/vncservers

prog=$"VNC server"

RETVAL=0

start() {
    # Source networking configuration.
    . /etc/sysconfig/network

    # Check that networking is up.
    [ ${NETWORKING} = "no" ] && exit 1

    [ -x /usr/bin/vncserver ] || exit 5
    [ -x /usr/bin/Xvnc ] || exit 5

    echo -n $"Starting $prog: "
    RETVAL=0
    if [ ! -d /tmp/.X11-unix ]
    then
        mkdir -m 1777 /tmp/.X11-unix || :
        restorecon /tmp/.X11-unix 2>/dev/null || :
    fi

    for display in ${VNCSERVERS}
    do
        SERVS=1
        echo -n "${display} "
	DISP="${display%%:*}"
	USER="${display##*:}"
	VNCUSERARGS="${VNCSERVERARGS[${DISP}]}"
        runuser -l ${USER} -c "cd ~${USER} && [ -r .vnc/passwd ] && vncserver :${DISP} ${VNCUSERARGS}"
        RETVAL=$?
        [ "$RETVAL" -eq 0 ] || break
    done
    if [ -z "$SERVS" ]; then
        echo -n "no displays configured "
        failure
        RETVAL=6
    else
        if [ "$RETVAL" -eq 0 ]; then
	    success $"vncserver startup"
	    touch /var/lock/subsys/vncserver
        else 
            failure $"vncserver start"
        fi
    fi
    echo
    return "$RETVAL"
}

stop() {
    echo -n $"Shutting down $prog: "
    for display in ${VNCSERVERS}
    do
        echo -n "${display} "
	export USER="${display##*:}"
	runuser ${USER} -c "vncserver -kill :${display%%:*}" >/dev/null 2>&1
    done
    RETVAL=$?
    [ "$RETVAL" -eq 0 ] && success $"vncserver shutdown" || \
        failure $"vncserver shutdown"
    echo
    [ "$RETVAL" -eq 0 ] && rm -f /var/lock/subsys/vncserver
    return "$RETVAL"
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  restart|force-reload)
	stop
	sleep 3
	start
	;;
  condrestart)
	echo "condrestart is obsolete, use try-restart instead"
	if [ -e /var/lock/subsys/vncserver ]; then
	    stop
	    sleep 3
	    start
	fi
	;;
  try-restart)
        if [ -e /var/lock/subsys/vncserver ]; then
            stop
            sleep 3
            start
        fi
        ;;
  status)
	status Xvnc
	RETVAL=$?
	;;
  *)
	echo $"Usage: $0 {start|stop|restart|try-restart|status|force-reload}"
	exit 3
esac

exit "$RETVAL"



--- NEW FILE vncserver.sysconfig ---
# The VNCSERVERS variable is a list of display:user pairs.
#
# Uncomment the lines below to start a VNC server on display :2
# as my 'myusername' (adjust this to your own).  You will also
# need to set a VNC password; run 'man vncpasswd' to see how
# to do that.  
#
# DO NOT RUN THIS SERVICE if your local area network is
# untrusted!  For a secure way of using VNC, see
# <URL:http://www.uk.research.att.com/archive/vnc/sshvnc.html>.

# Use "-nolisten tcp" to prevent X connections to your VNC server via TCP.

# Use "-nohttpd" to prevent web-based VNC clients connecting.

# Use "-localhost" to prevent remote VNC clients connecting except when
# doing so through a secure tunnel.  See the "-via" option in the
# `man vncviewer' manual page.

# VNCSERVERS="2:myusername"
# VNCSERVERARGS[2]="-geometry 800x600 -nolisten tcp -nohttpd -localhost"


--- NEW FILE vncviewer.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=TigerVNC Viewer
Comment=Connect to VNC server and display remote desktop
Exec=/usr/bin/vncviewer
Icon=tigervnc
Terminal=false
Type=Application
StartupWMClass=TigerVNC Viewer: Connection Details
Categories=Network;Application;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Mar 2009 21:02:04 -0000	1.2
+++ .cvsignore	3 Apr 2009 17:07:49 -0000	1.3
@@ -1,7 +1 @@
-tigervnc-0.0.90-20090303svn3631.tar.bz2
-vncserver.init
-vncserver.sysconfig
-vnc-16x16.png
-vnc-24x24.png
-vnc-48x48.png
-vncviewer.desktop
+tigervnc-0.0.90-20090403svn3751.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Mar 2009 21:02:04 -0000	1.2
+++ sources	3 Apr 2009 17:07:49 -0000	1.3
@@ -1,7 +1 @@
-8d262508edb0e18d9d114fc56955e2ed  tigervnc-0.0.90-20090303svn3631.tar.bz2
-ededd32e8bc5364c4bf41552d0b56b96  vncserver.init
-833229c4a91fd869ca8a4d1c5d189a15  vncserver.sysconfig
-2f19f562d4ff6b8752c1686331ce44b7  vnc-16x16.png
-273f51f58324f12e2cc96e2a1dcc5a6d  vnc-24x24.png
-f96d936a0fcc61cabee0e6cb65e0e38a  vnc-48x48.png
-2531d7bbc8369fb23e4cb1578521edc6  vncviewer.desktop
+34f63ea8b071b0e1996ac467455ee4c2  tigervnc-0.0.90-20090403svn3751.tar.bz2


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/devel/tigervnc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tigervnc.spec	3 Mar 2009 21:03:40 -0000	1.1
+++ tigervnc.spec	3 Apr 2009 17:07:49 -0000	1.2
@@ -1,10 +1,10 @@
-%define		revision	3631
-%define		date		20090303
-%define		releasetag	%{date}svn%{revision}
+%define	revision	3751
+%define	date		20090403
+%define	releasetag	%{date}svn%{revision}
 
 Name:		tigervnc
 Version:	0.0.90
-Release:	0.3.%{releasetag}%{?dist}
+Release:	0.3.1.%{releasetag}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -22,9 +22,6 @@
 Source0:	%{name}-%{version}-%{releasetag}.tar.bz2
 Source1:	vncserver.init
 Source2:	vncserver.sysconfig
-Source3:	vnc-16x16.png
-Source4:	vnc-24x24.png
-Source5:	vnc-48x48.png
 Source6:	vncviewer.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,10 +30,15 @@
 BuildRequires:	xorg-x11-xtrans-devel, xorg-x11-util-macros, libXtst-devel
 BuildRequires:	libdrm-devel, libXt-devel, pixman-devel libXfont-devel
 BuildRequires:	libxkbfile-devel, openssl-devel, libpciaccess-devel
-BuildRequires:	libjpeg-devel, mesa-libGL-devel, libXinerama-devel
+BuildRequires:	mesa-libGL-devel, libXinerama-devel, ImageMagick
 BuildRequires:  freetype-devel
 BuildRequires:	desktop-file-utils
 
+%ifarch %ix86
+BuildRequires: nasm
+%endif
+
+
 Requires(post):	coreutils	
 Requires(postun):coreutils	
 
@@ -47,12 +49,9 @@
 
 Patch0:		tigervnc-102434.patch
 Patch1:		tigervnc-bounds.patch
-Patch2:		tigervnc-xclients.patch
-Patch3:		tigervnc-clipboard.patch
 Patch4:		tigervnc-cookie.patch
 Patch5:		tigervnc-manminor.patch
 Patch6:		tigervnc-newfbsize.patch
-Patch7:		tigervnc-rh212985.patch
 Patch8:		tigervnc-viewer-reparent.patch
 
 %description
@@ -107,12 +106,9 @@
 
 %patch0 -p1 -b .102434
 %patch1 -p1 -b .bounds
-%patch2 -p1 -b .xclients
-%patch3 -p1 -b .clipboard
 %patch4 -p1 -b .cookie
 %patch5 -p1 -b .manminor
 %patch6 -p1 -b .newfbsize
-%patch7 -p1 -b .rh212985
 %patch8 -p1 -b .viewer-reparent
 
 # Use newer gettext
@@ -155,6 +151,11 @@
 make %{?_smp_mflags}
 popd
 
+# Build icons
+pushd media
+make
+popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 pushd unix
@@ -174,9 +175,12 @@
 
 # Install desktop stuff
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,24x24,48x48}/apps
-install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/vnc.png
-install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/vnc.png
-install -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/vnc.png
+
+pushd media/icons
+for s in 16 24 48; do
+install -m644 tigervnc_$s.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x$s/apps/tigervnc.png
+done
+popd
 
 mkdir $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
@@ -245,6 +249,17 @@
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Fri Apr 03 2009 Adam Tkac <atkac redhat com> 0.0.90-0.4.20090403svn3751
+- update to r3751
+- patches merged
+  - tigervnc-xclients.patch
+  - tigervnc-clipboard.patch
+  - tigervnc-rh212985.patch
+- basic RandR support in Xvnc (resize of the desktop)
+- use built-in libjpeg (SSE2/MMX accelerated encoding on x86 platform)
+- use Tight encoding by default
+- use TigerVNC icons
+
 * Tue Mar 03 2009 Adam Tkac <atkac redhat com> 0.0.90-0.3.20090303svn3631
 - update to r3631
 


--- tigervnc-clipboard.patch DELETED ---


--- tigervnc-rh212985.patch DELETED ---


--- tigervnc-xclients.patch DELETED ---


