Hello community, here is the log from the commit of package xorg-x11-Xvnc checked in at Wed Aug 16 18:18:38 CEST 2006. -------- --- xorg-x11-Xvnc/xorg-x11-Xvnc.changes 2006-08-09 14:11:19.000000000 +0200 +++ xorg-x11-Xvnc/xorg-x11-Xvnc.changes 2006-08-16 15:12:29.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 16 15:11:46 CEST 2006 - sndirsch@suse.de + +- fixed fontpath +- cleanup: spefile, removed unnecessary patches + +------------------------------------------------------------------- Old: ---- vnc-16x16.png vnc-24x24.png vnc-48x48.png vnc-4_1-javasrc.tar.gz vnc-build.patch vnc-cookie.patch vnc-newfbsize.patch vnc-nohttpd.patch vnc-null-interface.patch vnc-xclients.patch vncserver.init ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-Xvnc.spec ++++++ --- /var/tmp/diff_new_pack.5DkMDn/_old 2006-08-16 18:18:33.000000000 +0200 +++ /var/tmp/diff_new_pack.5DkMDn/_new 2006-08-16 18:18:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xorg-x11-Xvnc (Version 4.1.2) +# spec file for package xorg-x11-Xvnc (Version 7.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,55 +12,33 @@ Name: xorg-x11-Xvnc %define xorg_version 1.1.0 %define vnc_version 4_1_2 -%define java_vnc_version 4_1 Summary: VNC Server for the X Window System -Version: 4.1.2 +Version: 7.1 Release: 1 URL: http://xorg.freedesktop.org/ Source0: http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz -Source1: http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz -# This is from 'rpmbuild -bp xorg-x11.spec': Source2: xorg-server-%{xorg_version}.tar.bz2 -Source3: vncserver.init -Source5: vnc-16x16.png -Source6: vnc-24x24.png -Source7: vnc-48x48.png -Patch0: vnc-cookie.patch Patch1: vnc-gcc4.patch Patch2: vnc-use-fb.patch -Patch3: vnc-xclients.patch Patch4: vnc-idle.patch Patch5: vnc-via.patch -Patch6: vnc-build.patch Patch7: vnc-fPIC.patch Patch8: vnc-restart.patch Patch9: vnc-vncpasswd.patch Patch10: vnc-def.patch Patch11: vnc-modular-xorg.patch -Patch12: vnc-nohttpd.patch Patch13: vnc-fontpath.patch Patch14: vnc-s390.patch Patch15: vnc-viewer-reparent.patch Patch16: vnc-64bit.patch Patch17: vnc-select.patch -Patch18: vnc-null-interface.patch Patch19: vnc-ppc64.patch Patch20: vnc-opengl.patch -Patch21: vnc-newfbsize.patch Patch22: 64bit.diff License: GPL Group: System/X11/Servers/XF86_4 BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildPrereq: /usr/bin/perl tcpd -BuildRequires: libjpeg-devel zlib-devel -BuildRequires: desktop-file-utils >= 0.2.92 -BuildRequires: gcc-java -BuildRequires: autoconf automake bison flex libtool patchutils pkgconfig -BuildRequires: expat freetype2-devel -BuildRequires: gcc-c++ xorg-x11-devel -%ifnarch s390 s390x ppc64 -BuildRequires: libdrm-devel -%endif +BuildRequires: Mesa-devel expat freetype2-devel gcc-c++ libjpeg-devel pkgconfig xorg-x11-devel %description An X Window System server for Virtual Network Computing (VNC). @@ -117,23 +95,19 @@ Jim Gettys %prep -%setup -q -n vnc-%{vnc_version}-unixsrc -a1 +%setup -q -n vnc-%{vnc_version}-unixsrc pushd unix bzip2 -dc %{SOURCE2} | tar -xkf - || : popd -%patch0 -p1 -b .cookie %patch1 -p1 -b .gcc4 %patch2 -p1 -b .use-fb -%patch3 -p1 -b .xclients %patch4 -p1 -b .idle %patch5 -p1 -b .via -%patch6 -p1 -b .build %patch7 -p1 -b .fPIC %patch8 -p1 -b .restart %patch9 -p1 -b .vncpasswd %patch10 -p1 -b .def %patch11 -p1 -b .modular-xorg -%patch12 -p1 -b .nohttpd pushd unix/xorg-server-* %patch13 -p3 -b .fontpath %patch14 -p3 -b .s390 @@ -141,10 +115,8 @@ %patch15 -p1 -b .viewer-reparent %patch16 -p1 -b .64bit %patch17 -p1 -b .select -#patch18 -p1 -b .null-interface %patch19 -p1 -b .ppc64 %patch20 -p1 -b .opengl -%patch21 -p1 -b .newfbsize %patch22 -p0 -b .64bit cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \ unix/xc/programs/Xserver/Xvnc.man \ @@ -157,17 +129,11 @@ unix/xorg-server-*/hw/vnc/{cfb,fb,fbrop}.h %build -cd unix -autoconf # For use-fb patch -%configure --with-installed-zlib --with-fb -pushd ../common +cd common %configure --with-installed-zlib -popd make -cd ../vnc-%{java_vnc_version}-javasrc/java -#make JAVAC="gcj -C" JAR=fastjar -cd ../../unix/xorg-server-* -aclocal --force ; automake ; autoconf +cd ../unix/xorg-server-* +autoreconf -fi %configure --enable-xorg \ --disable-dependency-tracking \ --disable-xprint \ @@ -220,5 +186,8 @@ %endif %changelog -n xorg-x11-Xvnc +* Wed Aug 16 2006 - sndirsch@suse.de +- fixed fontpath +- cleanup: spefile, removed unnecessary patches * Wed Aug 09 2006 - sndirsch@suse.de - created package ++++++ vnc-fontpath.patch ++++++ --- /var/tmp/diff_new_pack.5DkMDn/_old 2006-08-16 18:18:33.000000000 +0200 +++ /var/tmp/diff_new_pack.5DkMDn/_new 2006-08-16 18:18:33.000000000 +0200 @@ -5,10 +5,10 @@ [ MESA_SOURCE="$withval" ], [ MESA_SOURCE="" ]) -AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]), -+AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${datadir}/X11/fonts)]), ++AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${datadir}/fonts)]), [ FONTDIR="$withval" ], - [ FONTDIR="${libdir}/X11/fonts" ]) -+ [ FONTDIR="${datadir}/X11/fonts" ]) ++ [ FONTDIR="${datadir}/fonts" ]) DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/" AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), [ FONTPATH="$withval" ], ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de