Author: pascalek Date: Sun Jan 4 17:07:49 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- updated to 4.1.3 (with modified fedora patches)
---- Files affected:
SPECS:
vnc.spec (1.84 -> 1.85)
---- Diffs:
================================================================
Index: SPECS/vnc.spec
diff -u SPECS/vnc.spec:1.84 SPECS/vnc.spec:1.85
--- SPECS/vnc.spec:1.84 Wed Jan 23 16:00:47 2008
+++ SPECS/vnc.spec Sun Jan 4 18:07:44 2009
@@ -2,22 +2,22 @@
%define docver 4.0
%define java_vncver 4_1
-%define mesa_version 6.5.3
-%define xserver_ver 1.4.0.90
+%define mesa_version 7.2
+%define xserver_ver 1.5.3
%define xname xorg-xserver-server
+%define _ver %(echo %{version} | tr . _)
-%define _ver %(echo %{version} | tr . _)
Summary: Virtual Network Computing
Summary(es.UTF-8): Sistema de control remoto
Summary(pl.UTF-8): Virtual Network Computing - zdalny desktop
Summary(pt_BR.UTF-8): Sistema de controle remoto
Name: vnc
-Version: 4.1.2
-Release: 4
+Version: 4.1.3
+Release: 0.1
License: GPL
Group: X11/Applications/Networking
-Source0:
http://fresh.t-systems-sfr.com/linux/src/%{name}-%{_ver}-unixsrc.tar.gz
-# Source0-md5: cf9a6fe8f592286b5e0fdde686504ffb
+Source0:
http://be.lunar-linux.org/lunar/mirrors/%{name}-%{_ver}-unixsrc.tar.gz
+# Source0-md5: a119f3c75ad2767c0588260e2abe39be
Source1:
http://www.realvnc.com/dist/%{name}-%{docver}-documentation.tar.gz
# Source1-md5: eb3bf940b88cabb238580e2ba31b927b
Source2:
http://fresh.t-systems-sfr.com/unix/src/misc/%{name}-%{java_vncver}-javasrc.tar.gz
@@ -28,11 +28,12 @@
Source6: %{name}-48x48.png
Source7: %{name}server.init
Source8: %{name}server.sysconfig
+Source9: %{name}-Makefile.am
#Sources and patches above 100 belong to xserver
Source100:
http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{xserver_ver}.tar.bz2
-# Source100-md5: bb16e969850dbb5d3805cb88d35656d0
+# Source100-md5: 308971036e25250e7fe3cccfd5a120f8
Source101: http://dl.sourceforge.net/mesa3d/MesaLib-%{mesa_version}.tar.bz2
-# Source101-md5: 46359457147c469745f24b5074a186f0
+# Source101-md5: 04d379292e023df0b0266825cb0dbde5
Source102: xserver.pamd
Patch0: %{name}-cookie.patch
Patch1: %{name}-gcc4.patch
@@ -40,44 +41,52 @@
Patch3: %{name}-xclients.patch
Patch4: %{name}-idle.patch
Patch5: %{name}-via.patch
-Patch6: %{name}-build.patch
-Patch7: %{name}-fPIC.patch
-Patch8: %{name}-restart.patch
-Patch9: %{name}-vncpasswd.patch
-Patch10: %{name}-def.patch
-Patch11: %{name}-modular-xorg.patch
-Patch12: %{name}-nohttpd.patch
-Patch13: %{name}-fontpath.patch
-Patch14: %{name}-s390.patch
-Patch15: %{name}-viewer-reparent.patch
-Patch16: %{name}-64bit.patch
-Patch17: %{name}-select.patch
-Patch18: %{name}-null-interface.patch
-Patch19: %{name}-ppc64.patch
-Patch20: %{name}-opengl.patch
-Patch21: %{name}-newfbsize.patch
-Patch22: %{name}-188169.patch
-Patch23: %{name}-210617.patch
-Patch24: %{name}-102434.patch
-Patch25: %{name}-config.patch
-Patch26: %{name}-render.patch
-Patch27: %{name}-xserver.patch
+Patch6: %{name}-restart.patch
+Patch7: %{name}-vncpasswd.patch
+Patch8: %{name}-modular-xorg.patch
+Patch9: %{name}-nohttpd.patch
+Patch10: %{name}-viewer-reparent.patch
+Patch11: %{name}-64bit.patch
+Patch12: %{name}-select.patch
+Patch13: %{name}-newfbsize.patch
+Patch14: %{name}-102434.patch
+Patch15: %{name}-config.patch
+Patch16: %{name}-render.patch
+Patch17: %{name}-autotools.patch
+Patch18: %{name}-autotools-compile.patch
+Patch19: %{name}-always_use_fb.patch
+Patch20: %{name}-vsnprintf.patch
+Patch21: %{name}-24bit.patch
+Patch22: %{name}-gcc43.patch
+Patch23: %{name}-xorg.patch
+Patch24: %{name}-privates.patch
+Patch25: %{name}-mieq.patch
+Patch26: %{name}-allocate.patch
+Patch27: %{name}-paint.patch
+Patch28: %{name}-selections.patch
+Patch29: %{name}-manminor.patch
+Patch30: %{name}-clipboard.patch
+Patch31: %{name}-scrollbars.patch
+Patch32: %{name}-bounds.patch
+Patch33: %{name}-includes.patch
+Patch34: %{name}-viewerIPv6.patch
+Patch35: %{name}-rh212985.patch
+Patch36: %{name}-build.patch
#Sources and patches above 100 belong to xserver
Patch100: %{xname}-ncurses.patch
Patch101: %{xname}-xwrapper.patch
-# nasty hack for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30052
-Patch102: %{xname}-gcc-x86_64-workaround.patch
-Patch103: %{xname}-link.patch
-Patch104:
ftp://ftp.freedesktop.org/pub/xorg/X11R7.3/patches/xorg-xserver-1.4-multiple-overflows.diff
URL: http://www.realvnc.com/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-java
BuildRequires: jar
+BuildRequires: libdrm-devel >= 2.4.1
BuildRequires: libstdc++-devel
BuildRequires: libtool
+BuildRequires: Mesa-libGL-devel >= 7.2
BuildRequires: pixman-devel >= 0.9.5
BuildRequires: xorg-lib-libICE-devel
+BuildRequires: xorg-lib-libpciaccess-devel >= 0.8.0
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXaw-devel
BuildRequires: xorg-lib-libXext-devel
@@ -92,7 +101,7 @@
BuildRequires: xorg-proto-damageproto-devel >= 1.1
BuildRequires: xorg-proto-fixesproto-devel >= 4.0
BuildRequires: xorg-proto-fontsproto-devel
-BuildRequires: xorg-proto-glproto-devel >= 1.4.8
+BuildRequires: xorg-proto-glproto-devel >= 1.4.9
BuildRequires: xorg-proto-inputproto-devel >= 1.4
BuildRequires: xorg-proto-kbproto-devel >= 1.0.3
BuildRequires: xorg-proto-randrproto-devel >= 1.2
@@ -231,18 +240,13 @@
Ten pakiet zawiera dokumentację do VNC (protokołu, programów itp.).
%prep
-%setup -q -n %{name}-4_1_2-unixsrc -a1 -a2 -a101
+%setup -q -n %{name}-%{_ver}-unixsrc -a1 -a2 -a101
cd unix
tar -xkjf %{SOURCE100}
ln -sf xorg-server-* xorg-server
cd xorg-server
%patch100 -p1
%patch101 -p0
-%ifarch %{x8664} i486
-%patch102 -p1
-%endif
-%patch103 -p1
-%patch104 -p1
# xserver uses pixman-1 API/ABI so put that explictly here
# update: we use local pixman.h copy too, see below
@@ -264,22 +268,20 @@
%patch10 -p1
%patch11 -p1
%patch12 -p1
-#%patch13 -p3 -b .fontpath
-#%patch14 -p3 -b .s390
+%patch13 -p1
+%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
-#patch18 -p1
+%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
+mkdir -p unix/xorg-server/hw/vnc
+cp %{SOURCE9} unix/xorg-server/hw/vnc/Makefile.am
cp -a \
unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
unix/xc/programs/Xserver/Xvnc.man \
@@ -293,32 +295,46 @@
sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \
unix/xorg-server/{hw/vnc/{cfb,fb,fbrop}.h,include/pixman.h}
+cd unix/xorg-server/hw/vnc
+%patch24 -p1
+cd -
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+
+
%build
-cd unix
+cd common
%{__libtoolize}
%{__aclocal}
%{__autoconf}
-%configure \
- --with-installed-zlib \
- --with-x
+%{__automake}
+%configure
+%{__make}
cd ..
-cd common
+cd unix
%{__libtoolize}
%{__aclocal}
%{__autoconf}
-%configure \
- --with-installed-zlib \
- --with-x
+%{__automake}
+%configure
+%{__make}
cd ..
cd vnc-%{java_vncver}-javasrc/java
%{__make} JAVAC="gcj -C" JAR=jar
cd ../..
-%{__make} -C unix
-%{__make} -C common
-
cd unix/xorg-server
%{__libtoolize}
%{__aclocal}
@@ -329,49 +345,67 @@
--with-os-name="PLD/Linux" \
--with-os-vendor="PLD/Team" \
\
- --enable-dga \
--enable-glx \
--enable-install-libxf86config \
- --enable-xvfb \
- --enable-xsecurity \
+ --enable-xcsecurity \
\
- --disable-builddocs \
+ --disable-composite \
+ --disable-config-dbus \
+ --disable-config-hal \
+ --disable-dri2 \
--disable-dmx \
- --disable-dri \
--disable-kdrive \
- --disable-lbx \
--disable-static \
- --disable-xace \
--disable-xephyr \
--disable-xevie \
--disable-xnest \
+ --disable-xorg \
--disable-xorgcfg \
--disable-xprint \
+ --disable-xtrap \
+ --disable-xvfb \
--disable-xwin \
\
--with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi"
\
+ --with-dri-driver-path=%{_libdir}/dri \
+ --with-fontdir=%{_datadir}/X11/fonts \
--with-mesa-source="`pwd`/../../Mesa-%{mesa_version}" \
- --with-xkb-output=/var/lib/xkb
+ --with-pic \
+ --with-rgb-path=%{_datadir}/X11/rgb \
+ --with-xkb-output=%{_localstatedir}/lib/xkb
cp -f %{_bindir}/libtool .
-%{__make}
+%{__make} \
+ CFLAGS="%{rpmcflags} -I/usr/include/drm"
cd ../..
%install
rm -rf $RPM_BUILD_ROOT
-cd unix
+cd common
+make install DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir}} \
- $RPM_BUILD_ROOT{%{_mandir}/man1,%{_libdir}/xorg/modules/extensions}
-./vncinstall
$RPM_BUILD_ROOT{%{_bindir},%{_mandir},%{_libdir}/xorg/modules/extensions}
+cd ../unix
+
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+for f in xorg-server/hw/vnc/Xvnc vncviewer/vncviewer vncpasswd/vncpasswd \
+ vncconfig/vncconfig vncserver x0vncserver/x0vncserver
+do
+ cp -pf $f.man $RPM_BUILD_ROOT%{_mandir}/man1/`basename $f.1`
+done
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+cp vncserver $RPM_BUILD_ROOT/usr/bin
+
+cd xorg-server/hw/vnc
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+cd ../../../
install -d $RPM_BUILD_ROOT%{_datadir}/vnc/classes
cp -a
../vnc-%{java_vncver}-javasrc/java/{index.vnc,logo150x150.gif,vncviewer.jar} \
$RPM_BUILD_ROOT%{_datadir}/vnc/classes
-install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,24x24,48x48}/apps
-install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
+install -d
$RPM_BUILD_ROOT{%{_datadir}/icons/hicolor/{16x16,24x24,48x48}/apps,%{_desktopdir}}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/vncviewer.desktop
install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/vnc.png
install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/vnc.png
install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/vnc.png
@@ -380,6 +414,10 @@
install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/vncserver
install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/vncserver
+# remove unwanted files
+rm -f $RPM_BUILD_ROOT%{_libdir}/librfb.*a
+rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libvnc.*a
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -421,6 +459,7 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/vncconfig
%attr(755,root,root) %{_bindir}/vncpasswd
+%{_libdir}/librfb.*
%{_mandir}/man1/vncconfig.1*
%{_mandir}/man1/vncpasswd.1*
@@ -434,7 +473,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.84 2008/01/23 15:00:47 glen
+Revision 1.85 2009/01/04 17:07:44 pascalek
+- updated to 4.1.3 (with modified fedora patches)
+
+Revision 1.84 2008-01-23 15:00:47 glen
- the macros aren't provided so don't define and check them
Revision 1.83 2008-01-18 08:19:48 pascalek
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/vnc.spec?r1=1.84&r2=1.85&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
