diff options
| -rw-r--r-- | vnc-ppc.patch | 235 | ||||
| -rw-r--r-- | vnc-vncserver.patch | 32 | ||||
| -rw-r--r-- | vnc.spec | 110 |
3 files changed, 0 insertions, 377 deletions
diff --git a/vnc-ppc.patch b/vnc-ppc.patch deleted file mode 100644 index 6773a8a..0000000 --- a/vnc-ppc.patch +++ /dev/null @@ -1,235 +0,0 @@ -diff -uNr vnc-3.3.2r2.orig/Xvnc/config/cf/Imake.cf vnc-3.3.2r2/Xvnc/config/cf/Imake.cf ---- vnc-3.3.2r2.orig/Xvnc/config/cf/Imake.cf Sun Jul 27 11:41:02 1997 -+++ vnc-3.3.2r2/Xvnc/config/cf/Imake.cf Tue Nov 3 15:35:01 1998 -@@ -540,8 +540,13 @@ - #endif /* WIN32 */ - - #ifdef linux --# define MacroIncludeFile <linux.cf> --# define MacroFile linux.cf -+# ifdef PPC -+# define MacroIncludeFile <linux-pmac.cf> -+# define MacroFile linux-pmac.cf -+# else -+# define MacroIncludeFile <linux.cf> -+# define MacroFile linux.cf -+# endif - # undef linux - # define LinuxArchitecture - # ifdef i386 -@@ -556,6 +561,9 @@ - # define Mc68020Architecture - # undef mc68000 - # endif /* mc68000 */ -+# ifdef PPC -+# define PPCArchitecture -+# endif - #endif /* linux */ - - #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) -diff -uNr vnc-3.3.2r2.orig/Xvnc/config/cf/Imakefile vnc-3.3.2r2/Xvnc/config/cf/Imakefile ---- vnc-3.3.2r2.orig/Xvnc/config/cf/Imakefile Sun Jul 27 11:41:03 1997 -+++ vnc-3.3.2r2/Xvnc/config/cf/Imakefile Tue Nov 3 15:35:01 1998 -@@ -90,6 +90,7 @@ - ibm.cf \ - isc.cf \ - linux.cf \ -+linux-pmac.cf \ - luna.cf \ - macII.cf \ - mach.cf \ -diff -uNr vnc-3.3.2r2.orig/Xvnc/config/cf/linux-pmac.cf vnc-3.3.2r2/Xvnc/config/cf/linux-pmac.cf ---- vnc-3.3.2r2.orig/Xvnc/config/cf/linux-pmac.cf Thu Jan 1 09:00:00 1970 -+++ vnc-3.3.2r2/Xvnc/config/cf/linux-pmac.cf Tue Nov 3 15:35:01 1998 -@@ -0,0 +1,95 @@ -+ -+#ifndef OSName -+#define OSName Linux -+#endif -+#ifndef OSVendor -+#define OSVendor Linux PPC -+#endif -+#ifndef OSMajorVersion -+#define OSMajorVersion 2 -+#endif -+#ifndef OSMinorVersion -+#define OSMinorVersion 0 -+#endif -+#ifndef OSTeenyVersion -+#define OSTeenyVersion 33 -+#endif -+ -+#define HasNdbm YES -+#define DBMLibrary -lgdbm -+#define UseElfFormat YES -+#define HasGcc YES -+#define HasGcc2 YES -+/* Create static and shared libraries */ -+#define HasSharedLibraries YES -+#define ForceNormalLib YES -+#define HasGcc2ForCplusplus YES -+#define GccUsesGas YES -+#define UseGas YES -+#define GnuCpp YES -+#define HasShadowPasswd YES -+#define HasLibCrypt YES -+#define HasPutenv YES -+#define HasShm YES -+#define HasSockets YES -+#define HasZlib YES -+ -+#define AvoidNullMakeCommand YES -+#define StripInstalledPrograms YES -+#define CompressAllFonts YES -+#define Malloc0ReturnsNull YES -+#define NeedConstPrototypes YES -+#define NeedFunctionPrototypes YES -+#define NeedNestedPrototypes YES -+#define NeedVarargsPrototypes YES -+#define NeedWidePrototypes NO -+#define SetTtyGroup YES -+ -+#define CcCmd gcc -+#define DefaultCCOptions -fsigned-char -+#define AsCmd as -+#define LdCmd ld -+#define AsmDefines -DUSE_GAS -U__ELF__ -+#define MkdirHierCmd mkdir -p -+#define CppCmd /lib/cpp -+#define YaccCmd byacc -+#define LexCmd flex -l -+#define LexLib -lfl -+#define PreProcessCmd CcCmd -E -+#define PostIncDir `CcCmd --print-libgcc-file-name | sed 's/libgcc.a/include/'` -+#define LdCombineFlags -r -+#define OptimizedCDebugFlags -O2 -+#define StandardDefines -Dlinux -DPPC -D__powerpc__ -D_POSIX_SOURCE \ -+ -D_BSD_SOURCE -D_SVID_SOURCE -DX_LOCALE -+#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC -+#define HasWChar32 YES -+#define StandardCppDefines -traditional StandardDefines -+#define ServerOSDefines -DDDXTIME -+#define ServerExtraDefines -DGCCUSESGAS -+#define ConnectionFlags -DUNIXCONN -DTCPCONN -+#define InstallXserverSetUID YES -+#define InstUidFlags -s -m 4711 -+ -+#define ServerExtraSysLibs -+ -+/* Some of these man page defaults are overriden in the above OS sections */ -+#ifndef ManSuffix -+# define ManSuffix 1x -+#endif -+#ifndef ManDir -+# define ManDir $(MANSOURCEPATH)1 -+#endif -+#ifndef LibManSuffix -+# define LibManSuffix 3x -+#endif -+#ifndef LibmanDir -+# define LibmanDir $(MANSOURCEPATH)3 -+#endif -+#ifndef FileManSuffix -+# define FileManSuffix 5x -+#endif -+#ifndef FileManDir -+# define FileManDir $(MANSOURCEPATH)5 -+#endif -+ -+#include <lnxLib.rules> -diff -uNr vnc-3.3.2r2.orig/Xvnc/config/cf/vnc.def vnc-3.3.2r2/Xvnc/config/cf/vnc.def ---- vnc-3.3.2r2.orig/Xvnc/config/cf/vnc.def Thu Jul 16 00:44:55 1998 -+++ vnc-3.3.2r2/Xvnc/config/cf/vnc.def Tue Nov 3 15:35:01 1998 -@@ -117,7 +117,7 @@ - #ifdef SunArchitecture - #define ProjectRoot /usr/openwin - #else --#ifdef i386Architecture -+#ifdef i386Architecture || PPCArchitecture - #define ProjectRoot /usr/X11R6 - #endif - #endif -diff -uNr vnc-3.3.2r2.orig/Xvnc/config/imake/imakemdep.h vnc-3.3.2r2/Xvnc/config/imake/imakemdep.h ---- vnc-3.3.2r2.orig/Xvnc/config/imake/imakemdep.h Sun Jul 27 11:41:05 1997 -+++ vnc-3.3.2r2/Xvnc/config/imake/imakemdep.h Tue Nov 3 18:20:00 1998 -@@ -766,6 +766,12 @@ - #ifdef mc68020 - {"mc68020", "1"}, - #endif -+#ifdef PPC -+ {"PPC", "1"}, -+#endif -+#ifdef __powerpc__ -+ {"__powerpc__", "1"}, -+#endif - #ifdef __GNUC__ - {"__GNUC__", "1"}, - #endif -diff -uNr vnc-3.3.2r2.orig/Xvnc/include/Xos.h vnc-3.3.2r2/Xvnc/include/Xos.h ---- vnc-3.3.2r2.orig/Xvnc/include/Xos.h Mon Mar 2 20:56:46 1998 -+++ vnc-3.3.2r2/Xvnc/include/Xos.h Tue Nov 3 15:35:01 1998 -@@ -118,7 +118,11 @@ - */ - #if (defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) || defined(macII)) && !defined(__GLIBC__) - #ifndef strerror -+#if defined(linux) && defined(PPC) -+extern const char *const sys_errlist[]; -+#else - extern char *sys_errlist[]; -+#endif - extern int sys_nerr; - #define strerror(n) \ - (((n) >= 0 && (n) < sys_nerr) ? sys_errlist[n] : "unknown error") -diff -uNr vnc-3.3.2r2.orig/Xvnc/programs/Xserver/include/servermd.h vnc-3.3.2r2/Xvnc/programs/Xserver/include/servermd.h ---- vnc-3.3.2r2.orig/Xvnc/programs/Xserver/include/servermd.h Mon Jul 28 23:17:34 1997 -+++ vnc-3.3.2r2/Xvnc/programs/Xserver/include/servermd.h Tue Nov 3 17:33:02 1998 -@@ -336,7 +336,18 @@ - - #endif /* luna */ - --#if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && defined(__i386__)) || (defined(__OpenBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || (defined(linux) && !defined(__mc68000__)) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__) || (defined(Lynx) && defined(__i386__))) -+#if (defined(i386) && (defined(SVR4) || defined(SYSV) || \ -+ (defined(sun) && defined(SVR4))) || \ -+ defined(__bsdi__) || \ -+ (defined(__NetBSD__) && defined(__i386__)) || \ -+ (defined(__OpenBSD__) && defined(__i386__)) || \ -+ defined(__FreeBSD__) || \ -+ defined(MACH386) || \ -+ (defined(linux) && ! (defined(__mc68000__) || defined(PPC))) || \ -+ (defined(AMOEBA) && defined(i80386)) || \ -+ defined(MINIX) || \ -+ defined(__EMX__) || \ -+ (defined(Lynx) && defined(__i386__))) - - #ifndef IMAGE_BYTE_ORDER - #define IMAGE_BYTE_ORDER LSBFirst -@@ -380,6 +391,18 @@ - #define GETLEFTBITS_ALIGNMENT 1 - - #endif /* linux/m68k */ -+ -+#if defined (linux) && defined (PPC) -+ -+#define IMAGE_BYTE_ORDER MSBFirst -+#define BITMAP_BIT_ORDER MSBFirst -+#define GLYPHPADBYTES 4 -+#define GETLEFTBITS_ALIGNMENT 1 -+ -+#define LARGE_INSTRUCTION_CACHE -+#define FAST_CONSTANT_OFFSET_MODE -+ -+#endif /* linux/PPC */ - - #ifdef sgi - -diff -uNr vnc-3.3.2r2.orig/vncviewer/sockets.c vnc-3.3.2r2/vncviewer/sockets.c ---- vnc-3.3.2r2.orig/vncviewer/sockets.c Fri Jan 16 03:21:00 1998 -+++ vnc-3.3.2r2/vncviewer/sockets.c Tue Nov 3 15:35:01 1998 -@@ -25,7 +25,6 @@ - #include <sys/socket.h> - #include <errno.h> - #include <netinet/in.h> --#include <netinet/tcp.h> - #include <arpa/inet.h> - #include <netdb.h> - #include <vncviewer.h> diff --git a/vnc-vncserver.patch b/vnc-vncserver.patch deleted file mode 100644 index 9db9763..0000000 --- a/vnc-vncserver.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur vnc.orig/vncserver vncserver ---- vnc.orig/vncserver Wed Jul 15 17:40:23 1998 -+++ vncserver Sat Jul 25 02:42:02 1998 -@@ -35,16 +35,13 @@ - $geometry = "1024x768"; - $depth = 8; - $desktopName = "X"; --$vncClasses = "/usr/local/vnc/classes"; -+$vncClasses = "/usr/share/vnc/classes"; - $vncUserDir = "$ENV{HOME}/.vnc"; - $xauthorityFile = "$ENV{HOME}/.Xauthority"; - - $defaultXStartup - = ("#!/bin/sh\n\n". -- "xrdb \$HOME/.Xresources\n". -- "xsetroot -solid grey\n". -- "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n". -- "twm &\n"); -+ "exec /etc/X11/xinit/xinitrc &\n"); - - chop($host = `uname -n`); - -@@ -146,7 +143,8 @@ - # - # $cmd .= " -fp /usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/"; - # $cmd .= " -co /usr/lib/X11/rgb"; --# -+$cmd .= ' -fp ' . join(',', grep {-f "$_/fonts.dir"} </usr/X11R6/lib/X11/fonts/*>); -+$cmd .= " -co /usr/lib/X11/rgb"; - - foreach $arg (@ARGV) { - $cmd .= " " . "edString($arg); diff --git a/vnc.spec b/vnc.spec deleted file mode 100644 index 7bf442c..0000000 --- a/vnc.spec +++ /dev/null @@ -1,110 +0,0 @@ -Summary: Virtual Network Computing -%define name vnc -Name: %{name} -%define version 3.3.2r3 -Version: %{version} -Release: 2 -URL: http://www.uk.research.att.com/vnc/ -Source: http://www.uk.research.att.com/vnc/dist/%{name}-%{version}_unixsrc.tgz -Source1: http://www.uk.research.att.com/vnc/dist/%{name}-%{version}_doc.tgz -Patch: vnc-3.3.2r2-vncserver.patch -Patch1: vnc-3.3.2r2-ppc.patch -Copyright: GPL -Group: X11/Applications/Networking -Group: X11/Aplikacje/Sieciowe -BuildRoot: /tmp/%{name}-%{version}-root -Summary(pl): Virtual Network Computing -- zdalny desktop - -%description -VNC stands for Virtual Network Computing. It is, in essence, a remote display -system which allows you to view a computing 'desktop' environment not only on -the machine where it is running, but from anywhere on the Internet and from a -wide variety of machine architectures. - -%description -VNC oznacza Virtual Network Computing. Pakiet ten pozwala na uzyskanie -obrazu zdalnego desktopu z dowolnej maszynie wyposażnej w odpowiedni -serwer. Dostępne są serwery dla Win32, Mac 8.x i X11 a klienty dla Win32, -Mac 8.x, X11, Windows CE, BeOS i Java (np. w przeglądarce działającej -po HTTP). - -%prep -#%setup -q -n %{name} -%setup -q -n %{name}-%{version} -c -mkdir doc -cd doc -gzip -dc %{SOURCE1} | tar -xf - -cd .. - -%patch -p1 -%ifarch ppc -%patch1 -p1 -%endif - -%build -xmkmf -make CDEBUGFLAGS="$RPM_OPT_FLAGS" World -cd Xvnc -make CDEBUGFLAGS="$RPM_OPT_FLAGS" World - -%install -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/usr/X11R6/bin -install -d $RPM_BUILD_ROOT%{_datadir}/vnc/classes -./vncinstall $RPM_BUILD_ROOT/usr/X11R6/bin -install -m644 classes/* $RPM_BUILD_ROOT%{_datadir}/vnc/classes -strip $RPM_BUILD_ROOT/usr/X11R6/bin/Xvnc -strip $RPM_BUILD_ROOT/usr/X11R6/bin/vncpasswd -strip $RPM_BUILD_ROOT/usr/X11R6/bin/vncviewer - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(644,root,root,755) -%attr(711,root,root) /usr/X11R6/bin/Xvnc -%attr(711,root,root) /usr/X11R6/bin/vncpasswd -%attr(755,root,root) /usr/X11R6/bin/vncserver -%attr(711,root,root) /usr/X11R6/bin/vncviewer -%{_datadir}/vnc/classes/ -%doc doc/ -%doc README - -%changelog -* Thu Feb 4 1999 Ziemek Borowski <ziembor@faq-bot.ziembor.waw.pl> - [3.3.2r3-1d] -- added documentation -- build angainst glibc 2.1 -- added mode detail %attr in %files section -- Polish language spec translation - -* Sat Nov 7 1998 INOUE Koichi <inoue@ma.ns.musashi-tech.ac.jp> - [3.3.2r2-1a] -- Add patch for compiling against LinuxPPC. - -* Sat Jul 25 1998 Arne Coucheron <arneco@online.no> - [3.3.2r2-1] - -* Mon Jul 06 1998 Arne Coucheron <arneco@online.no> - [3.3.2-3] -- it would have been nice if people updating the package would follow - common sense and do it so using existing ones, and also update their - changes in the changelog, but I guess some find this rule hard to follow -- binaries moved back to /usr/X11R6/bin - -* Tue May 26 1998 Arne Coucheron <arneco@online.no> - [3.3.2-1] -- moved java classes to %{_datadir}/vnc/classes -- moved binaries to %{_bindir} -- using predefined %%{name} and %%{version} -- using %defattr in filelist, this means that rpm 2.5 is required to build - -* Tue Mar 17 1998 Arne Coucheron <arneco@online.no> - [3.3.1-4] -- added a new font patch, hopefully this works better (Thanks to Gábor J.Tóth) - -* Sun Mar 01 1998 Arne Coucheron <arneco@online.no> - [3.3.1-3] -- using buildroot and %attr macros -- added patch to make it build against glibc -- added patch to make it find the fonts on RH5 |