packages: tigervnc/tigervnc.spec - builds - cleaned up descriptions - xorg ...

baggins baggins at pld-linux.org
Sun Oct 10 20:24:45 CEST 2010 

Author: baggins                      Date: Sun Oct 10 18:24:45 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- builds
- cleaned up descriptions
- xorg configure options reflect xorg-xserver-server
- updated files

---- Files affected:
packages/tigervnc:
   tigervnc.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/tigervnc/tigervnc.spec
diff -u packages/tigervnc/tigervnc.spec:1.3 packages/tigervnc/tigervnc.spec:1.4
--- packages/tigervnc/tigervnc.spec:1.3	Sun Oct 10 18:23:36 2010
+++ packages/tigervnc/tigervnc.spec	Sun Oct 10 20:24:40 2010
@@ -4,7 +4,7 @@
 # - descriptions!
 
 %define		snap		r4159
-%define		xversion	1.9.0.901
+%define		xversion	1.9
 
 Summary:	A TigerVNC remote display system
 Summary(pl.UTF-8):	System zdalnego dostępu TigerVNC
@@ -17,11 +17,20 @@
 Source0:	%{name}-%{version}-%{snap}.tar.bz2
 # Source0-md5:	bd83717c960fb9e585387948b5cb41e2
 Source1:	%{name}.desktop
+Patch0:		tigervnc-cookie.patch
+Patch1:		tigervnc-ldnow.patch
+Patch2:		tigervnc-rh102434.patch
+Patch3:		tigervnc-rh611677-generate_modkeymap-max_keys.patch
+Patch4:		tigervnc-rh611677.patch
+Patch5:		tigervnc-rh633931.patch
+Patch6:		tigervnc-viewer-reparent.patch
+Patch7:		tigervnc-as-needed.patch
 URL:		http://www.tigervnc.com/
+BuildRequires:	ImageMagick
 BuildRequires:	cpp
 BuildRequires:	libjpeg-devel
 BuildRequires:	zlib-devel
-BuildRequires:	xorg-xserver-server-source = %{xversion}
+BuildRequires:	xorg-xserver-server-source >= %{xversion}
 # xserver BRs, should match xorg-xserver-server.spec
 BuildRequires:	Mesa-libGL-devel >= 7.8.1
 # for glx headers
@@ -70,7 +79,7 @@
 BuildRequires:	xorg-proto-kbproto-devel >= 1.0.3
 BuildRequires:	xorg-proto-printproto-devel
 BuildRequires:	xorg-proto-randrproto-devel >= 1.2.99.3
-%{?with_record:BuildRequires:	xorg-proto-recordproto-devel}
+BuildRequires:	xorg-proto-recordproto-devel
 BuildRequires:	xorg-proto-renderproto-devel >= 0.11
 BuildRequires:	xorg-proto-resourceproto-devel
 BuildRequires:	xorg-proto-scrnsaverproto-devel >= 1.1.0
@@ -88,21 +97,12 @@
 Conflicts:	vnc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_xserverver	%(LC_ALL=C rpm -q --qf '%{V}' xorg-xserver-server-source)
+
 %description
-VNC is a great client/server software package allowing remote network
-access to graphical desktops. TightVNC is optimized to work over slow
-network connections such as low-speed modem links. While oroginal VNC
-may be verry slow when your connection is not fast enough, with
-TightVNC you can work remotely almost in real time in most
-environments.
-
-%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.
+TigerVNC is a suite of VNC servers and clients that have a focus on
+performance and remote display functionality. Originally this software
+was based on the (never released) VNC 4 branch of TightVNC.
 
 %package server
 Summary:	VNC X server - TigerVNC version
@@ -116,10 +116,10 @@
 Obsoletes:	vnc-server
 
 %description server
-This package contains VNC X server in tightvnc version.
+This package contains VNC X server in TigerVNC version.
 
 %description server -l pl.UTF-8
-Ten pakiet zawiera X serwer VNC w wersji tightvnc.
+Ten pakiet zawiera X serwer VNC w wersji TigerVNC.
 
 %package utils
 Summary:	Additional utilities for TigerVNC
@@ -128,21 +128,15 @@
 Obsoletes:	vnc-utils
 
 %description utils
-This package contains additional tightvnc utilities: vncconnect and
-vncpasswd. vncconnect tells Xvnc server to connect to a listening
-tightvnc viewer. vncpasswd generates password file (both on server and
-viewer side).
-
-%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).
+This package contains additional TigerVNC utilities: vncconfig and
+vncpasswd. vncconfig is used to configure and control a running
+instance of Xvnc, or any other X server with the VNC extension.
+vncpasswd generates password file (both on server and viewer side).
 
 %package -n xorg-xserver-libvnc
 Summary:	TigerVNC module for X.org server
 Group:		X11/Servers
-Requires:	xorg-xserver-server = %{xversion}
+%requires_eq_to	xorg-xserver-server xorg-xserver-server-source
 Provides:	xorg-xserver-module(vnc)
 
 %description -n xorg-xserver-libvnc
@@ -151,12 +145,20 @@
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+
 %{__sed} -i -e 's|^po/Makefile.in||' configure.ac
 
-cp -a %{_usrsrc}/xorg-xserver-server-%{xversion}/* unix/xserver
+cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver
 cd unix/xserver
 patch -p1 <../xserver19.patch
-#%patch11 -p1
+%patch3 -p1
 
 %build
 %{__gettextize}
@@ -175,6 +177,17 @@
 %{__automake}
 %{__autoconf}
 %configure \
+	--with-os-name="PLD/Linux" \
+	--with-os-vendor="PLD/Team" \
+	--disable-config-dbus \
+	--disable-config-hal \
+	--disable-config-udev \
+	--disable-builddocs \
+	--without-xmlto \
+	--without-fop \
+	--without-doxygen \
+	--disable-devel-docs \
+	--with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \
 	--disable-xorg \
 	--disable-xnest \
 	--disable-xvfb \
@@ -182,36 +195,35 @@
 	--disable-xwin \
 	--disable-xephyr \
 	--disable-kdrive \
+	--disable-xfbdev \
+	--disable-dri2 \
 	--with-pic \
 	--disable-static \
 	--disable-xinerama \
 	--disable-composite \
-	--with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \
-	--with-fontdir=%{_datadir}/X11/fonts \
-	--with-xkb-output=%{_localstatedir}/lib/xkb \
-	--enable-install-libxf86config \
-	--disable-dri2 \
 	--enable-glx \
-	--disable-config-dbus \
-	--disable-config-hal \
-	--disable-config-udev \
-	--with-dri-driver-path=%{_libdir}/dri \
-	--without-xmlto \
-	--without-fop \
-	--without-doxygen \
-	--disable-devel-docs \
-	--disable-builddocs
+	--enable-glx-tls \
+	--enable-aiglx \
+	--enable-dga \
+	--enable-glx-tls \
+	--enable-install-libxf86config \
+	--enable-record \
+	--disable-xsdl \
+	--disable-xfake \
+	--enable-secure-rpc \
+	--with-dri-driver-path=%{_libdir}/xorg/modules/dri \
+	--with-xkb-output=/var/lib/xkb
 
 %{__make}
 cd -
 
-# Build icons
 cd media
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_sysconfdir}}
+install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/{16x16,22x22,24x24,32x32,48x48,scalable}/apps \
+	$RPM_BUILD_ROOT%{_desktopdir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -221,31 +233,42 @@
 	DESTDIR=$RPM_BUILD_ROOT
 cd -
 
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+
+install media/icons/tigervnc_16.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/16x16/apps/tigervnc.png
+install media/icons/tigervnc_22.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/22x22/apps/tigervnc.png
+install media/icons/tigervnc_24.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/24x24/apps/tigervnc.png
+install media/icons/tigervnc_32.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/32x32/apps/tigervnc.png
+install media/icons/tigervnc_48.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/apps/tigervnc.png
+install media/icons/tigervnc.svg $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/tigervnc.svg
+
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc doc/*
 %attr(755,root,root) %{_bindir}/vncviewer
 %{_mandir}/man1/vncviewer.1*
-%{_desktopdir}/tightvnc.desktop
-%{_pixmapsdir}/tightvnc.png
+%{_desktopdir}/tigervnc.desktop
+%{_iconsdir}/hicolor/*/apps/tigervnc.*
 
 %files server
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/tightvncserver.conf
 %attr(755,root,root) %{_bindir}/Xvnc
-%attr(755,root,root) %{_bindir}/x0vncserver
 %attr(755,root,root) %{_bindir}/vncserver
-%{_datadir}/vnc
+%attr(755,root,root) %{_bindir}/x0vncserver
 %{_mandir}/man1/Xvnc.1*
-%{_mandir}/man1/x0vncserver.1*
 %{_mandir}/man1/vncserver.1*
+%{_mandir}/man1/x0vncserver.1*
 
 %files utils
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/vncconfig
 %attr(755,root,root) %{_bindir}/vncpasswd
+%{_mandir}/man1/vncconfig.1*
 %{_mandir}/man1/vncpasswd.1*
 
 %files -n xorg-xserver-libvnc
@@ -258,6 +281,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2010/10/10 18:24:40  baggins
+- builds
+- cleaned up descriptions
+- xorg configure options reflect xorg-xserver-server
+- updated files
+
 Revision 1.3  2010/10/10 16:23:36  baggins
 - build Xvnc from xorg-xserver-server-source
 - added libvnc extension package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tigervnc/tigervnc.spec?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list