SPECS (AC-branch): tightvnc.spec - up to 1.3.9 (recently announced...

Sun May 13 11:11:12 CEST 2007

Author: twittner                     Date: Sun May 13 09:11:12 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- up to 1.3.9 (recently announced as "stable") on AC-branch
- rel. 0.1 for testing

---- Files affected:
SPECS:
   tightvnc.spec (1.22.2.1 -> 1.22.2.2) 

---- Diffs:

================================================================
Index: SPECS/tightvnc.spec
diff -u SPECS/tightvnc.spec:1.22.2.1 SPECS/tightvnc.spec:1.22.2.2

--- SPECS/tightvnc.spec:1.22.2.1	Sun Mar 27 23:00:42 2005
+++ SPECS/tightvnc.spec	Sun May 13 11:11:07 2007
@@ -1,24 +1,32 @@
 # $Revision$, $Date$
 # TODO:
-# tightvnc.init
+# - tightvnc.init
+# - segfaults on amd64
 Summary:	tightvnc - application based on the VNC version 3.3.3r2
-Summary(pl):	tightvnc - aplikacja bazująca na VNC w wersji 3.3.3r2
+Summary(pl.UTF-8):	tightvnc - aplikacja bazujÄ
ca na VNC w wersji 3.3.3r2
 Name:		tightvnc
-Version:	1.2.9
-Release:	7
+Version:	1.3.9
+Release:	0.1
 License:	GPL
-Vendor:		Const Kaplinsky <const_k at users.sourceforge.net>
 Group:		X11/Applications/Networking
 Source0:	http://dl.sourceforge.net/vnc-tight/%{name}-%{version}_unixsrc.tar.bz2
-# Source0-md5:	f804b26c098625e3a2675a0aa7709e31
+# Source0-md5:	49a0748ea52793f2e3069e05af28f716
+Source1:	%{name}.desktop
+Source2:	%{name}48.png
 Patch0:		%{name}-vncserver.patch
 Patch1:		%{name}-imake.patch
-Source1:	%{name}.desktop
+Patch2:		%{name}-security.patch
+Patch3:		%{name}-imake-tmpdir.patch
 URL:		http://www.tightvnc.com/
+BuildRequires:	cpp
 BuildRequires:	libjpeg-devel
+BuildRequires:	X11-devel
+BuildRequires:	X11-imake
 BuildRequires:	zlib
 Provides:	vnc-client
 Obsoletes:	vnc
+# server proc crashes atm
+#ExcludeArch:	amd64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -29,30 +37,34 @@
 TightVNC you can work remotely almost in real time in most
 environments.
 
-%description -l pl
-VNC jest wspaniałym programem klient/serwer umożliwiającym zdalny
-dostęp do graficznych pulpitów. TightVNC jest zoptymalizowany do pracy
-przy wolniejszych połączeniach sieciowych takich jak połączenia
-modemowe. Oryginalne VNC może pracować wolno kiedy połączenie nie jest
-wystarczająco szybkie, natomiast z TightVNC możesz pracować zdalnie
+%description -l pl.UTF-8
+VNC jest wspaniaĹ‚ym programem klient/serwer umoĹźliwiajÄ
cym zdalny
+dostÄ™p do graficznych pulpitĂłw. TightVNC jest zoptymalizowany do pracy
+przy wolniejszych poĹ‚Ä
czeniach sieciowych takich jak poĹ‚Ä
czenia
+modemowe. Oryginalne VNC moĹźe pracowaÄ‡ wolno kiedy poĹ‚Ä
czenie nie jest
+wystarczajÄ
co szybkie, natomiast z TightVNC moĹźesz pracowaÄ‡ zdalnie
 niemal w czasie rzeczywistym.
 
 %package server
 Summary:	VNC X server - tightvnc version
-Summary(pl):	X serwer VNC - wersja tightvnc
+Summary(pl.UTF-8):	X serwer VNC - wersja tightvnc
 Group:		X11/Applications/Networking
-Requires:	XFree86-common
+Requires:	X11-common
+# for vncpasswd tool
+Requires:	%{name}-utils = %{version}-%{release}
+# for mcookie
+Requires:	util-linux
 Obsoletes:	vnc-server
 
 %description server
 This package contains VNC X server in tightvnc version.
 
-%description server -l pl
+%description server -l pl.UTF-8
 Ten pakiet zawiera X serwer VNC w wersji tightvnc.
 
 %package utils
 Summary:	Additional utilities for tightvnc
-Summary(pl):	Dodatkowe narzędzia do tightvnc
+Summary(pl.UTF-8):	Dodatkowe narzÄ™dzia do tightvnc
 Group:		X11/Applications/Networking
 Obsoletes:	vnc-utils
 
@@ -62,33 +74,38 @@
 tightvnc viewer. vncpasswd generates password file (both on server and
 viewer side).
 
-%description utils -l pl
-Ten pakiet zawiera dodatkowe narzędzia do tightvnc: vncconnect i
-vncpasswd. vncconnect służy do połączenia serwera Xvnc z nasłuchującym
-vncviewerem. vncpasswd służy to tworzenia pliku z hasłem (zarówno po
-stronie serwera, jak i przeglądarki).
+%description utils -l pl.UTF-8
+Ten pakiet zawiera dodatkowe narzÄ™dzia do tightvnc: vncconnect i
+vncpasswd. vncconnect sĹ‚uĹźy do poĹ‚Ä
czenia serwera Xvnc z nasĹ‚uchujÄ
cym
+vncviewerem. vncpasswd sĹ‚uĹźy to tworzenia pliku z hasĹ‚em (zarĂłwno po
+stronie serwera, jak i przeglÄ
darki).
 
 %prep
 %setup -qn vnc_unixsrc
 %patch0 -p1
 %patch1 -p1
+%patch2 -p2
+%patch3 -p1
 
 %build
 xmkmf
 %{__make} World \
 	CC="%{__cc}" \
-	CDEBUGFLAGS="%{rpmcflags}"
+	CDEBUGFLAGS="%{rpmcflags}" \
+	EXTRA_LDOPTIONS="%{rpmldflags}"
 cd Xvnc
 ./configure
 %{__make} \
 	CC="%{__cc}" \
-	CDEBUGFLAGS="%{rpmcflags}"
+	CDEBUGFLAGS="%{rpmcflags}" \
+	EXTRA_LDOPTIONS="%{rpmldflags}" \
+	FONTDIR=/usr/share/fonts
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_datadir}/vnc/classes} \
-	$RPM_BUILD_ROOT%{_desktopdir}
-	
+	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+
 install vncserver vncviewer/vncviewer vncpasswd/vncpasswd \
 	vncconnect/vncconnect Xvnc/programs/Xserver/Xvnc $RPM_BUILD_ROOT%{_bindir}
 
@@ -101,6 +118,7 @@
 install Xvnc/programs/Xserver/Xvnc.man $RPM_BUILD_ROOT%{_mandir}/man1/Xvnc.1
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -111,6 +129,7 @@
 %attr(755,root,root) %{_bindir}/vncviewer
 %{_mandir}/man1/vncviewer.1*
 %{_desktopdir}/tightvnc.desktop
+%{_pixmapsdir}/tightvnc.png
 
 %files server
 %defattr(644,root,root,755)
@@ -133,10 +152,99 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.22.2.1  2005/03/27 21:00:42  baggins
-- release 7
-- fixed completely bogus vncserver script
-- STBR AC
+Revision 1.22.2.2  2007/05/13 09:11:07  twittner
+- up to 1.3.9 (recently announced as "stable") on AC-branch
+- rel. 0.1 for testing
+
+Revision 1.48  2007/05/10 20:32:28  twittner
+- rel. 1 - tested, works
+
+Revision 1.47  2007/05/10 19:59:53  twittner
+- up to 1.3.9
+- rel. 0.1 - builds (but first build with make -j 5 failed), not tested
+
+Revision 1.46  2007/04/02 06:03:16  twittner
+- rel. 3 (problem with font paths is resolved)
+
+Revision 1.45  2007/04/01 18:32:16  twittner
+- the next try to fix font paths - sth works (compiled on th-i486,
+  on x86_64 [carme] build fails during linking)
+- rel. 2.3
+
+Revision 1.44  2007/04/01 17:18:28  twittner
+- more /usr/X11R6 -> /usr fixes (not tested yet)
+- rel. 2.2
+
+Revision 1.43  2007/04/01 17:04:41  twittner
+- /usr/X11R6 -> /usr in paths
+- rel. 2.1 for testing
+
+Revision 1.42  2007/02/17 17:34:37  baggins
+- rel 2
+- req xorg-app-rgb instead of XFree86-common
+
+Revision 1.41  2007/02/12 22:09:17  glen
+- tabs in preamble
+
+Revision 1.40  2007/02/12 01:06:34  baggins
+- converted to UTF-8
+
+Revision 1.39  2007/01/06 19:56:02  arekm
+- rel 1
+
+Revision 1.38  2006/08/26 21:54:01  qboosh
+- more
+
+Revision 1.37  2006/08/26 19:33:16  arekm
+- th BR
+
+Revision 1.36  2006/08/21 15:06:15  charles
+- updated to 1.3.8
+- BR: cpp
+- rel. 0.1; req. checking for amd64
+
+Revision 1.35  2006/01/29 12:12:23  glen
+- add excludearch for amd64 due it's crashing there
+
+Revision 1.34  2006/01/27 13:38:23  glen
+- add security related patches from gentoo
+
+Revision 1.33  2006/01/27 11:38:11  glen
+- -server needs vncpasswd
+
+Revision 1.32  2005/07/26 23:03:16  charles
+- up to 1.3dev7
+- removed outdated -malloc.patch
+
+Revision 1.31  2005/04/04 15:22:58  baggins
+- release .4
+- removed fds_bits breakage
+
+Revision 1.30  2005/03/27 20:52:39  baggins
+- duh, mistaken version and release
+
+Revision 1.29  2005/03/27 20:48:25  baggins
+- release 1.4
+- fixed (a completely non-working) vncserver script
+
+Revision 1.28  2005/02/27 20:18:25  darekr
+- sorted BRs
+
+Revision 1.27  2005/02/05 14:55:36  wolf
+- corrected
+- rel .2
+
+Revision 1.26  2005/02/05 14:50:17  wolf
+- added icon
+
+Revision 1.25  2005/02/03 21:05:02  arekm
+- BR: XFree86-devel
+
+Revision 1.24  2005/02/03 20:24:03  wolf
+- 1.3dev5
+
+Revision 1.23  2004/11/21 19:35:20  arekm
+- rel 7; fixed path
 
 Revision 1.22  2004/11/04 11:27:02  paladine
 - rel 6 for fixed desktop file
@@ -157,7 +265,7 @@
 - added imake patch, release 4
 
 Revision 1.16  2003/10/08 12:57:08  krzak
-- tightvnc.desktop to %%{_desktopdir}
+- tightvnc.desktop to %{_desktopdir}
 - fixes in tightvnc.desktop file
 - rel 3
 
@@ -200,10 +308,10 @@
 
 Revision 1.4  2002/07/14 16:15:40  kloczek
 - finished (please keep new spec close to some .. standards ;)
-NOTE: missing icon for desktop file.
+  NOTE: missing icon for desktop file.
 
 Revision 1.3  2002/07/12 20:30:02  djrzulf
 - corrected source s/dll/dl/,
 
 Revision 1.2  2002/07/08 00:56:26  krolik
-modifided %changelog section
+- modifided %changelog section
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/tightvnc.spec?r1=1.22.2.1&r2=1.22.2.2&f=u

