X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=tigervnc.spec;h=cd9c64bc3f03f95fbe737d10b2e7ccc068553661;hb=a5f2294fd721db65c93c74abf2342bdb75433be3;hp=cf381eb7c0f26946e2969c60e30ff71ed46c18e4;hpb=5916d37a3a446af663ee2a53fb28b9b42bece824;p=packages%2Ftigervnc.git

diff --git a/tigervnc.spec b/tigervnc.spec
index cf381eb..cd9c64b 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,45 +1,46 @@
-# TODO:
-# - tigervnc.init
-
-%define		snap		r4159
-%define		xversion	1.9.3
+%define		xversion	1.14.0
 
 Summary:	A TigerVNC remote display system
 Summary(pl.UTF-8):	System zdalnego dostępu TigerVNC
 Name:		tigervnc
-Version:	1.0.90
-Release:	11
+Version:	1.3.0
+Release:	2
 License:	GPL v2
 Group:		X11/Applications/Networking
-#Source0:	http://dl.sourceforge.net/tigervnc/%{name}-%{version}.tar.gz
-Source0:	%{name}-%{version}-%{snap}.tar.bz2
-# Source0-md5:	bd83717c960fb9e585387948b5cb41e2
+Source0:	http://download.sourceforge.net/tigervnc/%{name}-%{version}.tar.bz2
+# Source0-md5:	a5158228e64d14496821a39bf3851f1b
 Source1:	%{name}.desktop
-Patch0:		tigervnc-cookie.patch
-Patch1:		tigervnc-ldnow.patch
-Patch2:		tigervnc-rh102434.patch
-Patch3:		tigervnc-rh611677.patch
-Patch4:		tigervnc-rh633931.patch
-Patch5:		tigervnc-viewer-reparent.patch
-Patch6:		tigervnc-as-needed.patch
-Patch7:		tigervnc-options-dialog.patch
+Source2:	vncserver.init
+Source3:	vncserver.sysconfig
+Patch0:		%{name}-cookie.patch
+Patch1:		%{name}-ldnow.patch
+Patch2:		%{name}-rh102434.patch
+Patch3:		%{name}-as-needed.patch
+Patch4:		%{name}-ipv6.patch
+Patch5:		%{name}-rh692048.patch
+Patch6:		no-bashizm.patch
+Patch7:		format-security.patch
+Patch8:		%{name}-typecast.patch
+Patch9:		xserver.patch
 URL:		http://www.tigervnc.com/
 BuildRequires:	ImageMagick
 BuildRequires:	ImageMagick-coder-png
 BuildRequires:	ImageMagick-coder-svg
+BuildRequires:	Mesa-libGL-devel >= 7.8.1
 BuildRequires:	cpp
+BuildRequires:	fltk-devel
 BuildRequires:	gnutls-devel
-BuildRequires:	libjpeg-devel
-BuildRequires:	zlib-devel
+BuildRequires:	libjpeg-turbo-devel
 BuildRequires:	xorg-xserver-server-source >= %{xversion}
+BuildRequires:	zlib-devel
 # xserver BRs, should match xorg-xserver-server.spec
-BuildRequires:	Mesa-libGL-devel >= 7.8.1
 # for glx headers
 BuildRequires:	OpenGL-GLX-devel
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	libdrm-devel >= 2.4.5
 BuildRequires:	libtool
+BuildRequires:	nasm
 BuildRequires:	ncurses-devel
 BuildRequires:	pam-devel
 BuildRequires:	perl-base
@@ -52,7 +53,7 @@ BuildRequires:	xorg-lib-libXau-devel
 BuildRequires:	xorg-lib-libXaw-devel
 BuildRequires:	xorg-lib-libXdamage-devel
 BuildRequires:	xorg-lib-libXdmcp-devel
-BuildRequires:	xorg-lib-libXext-devel  >= 1.0.99.4
+BuildRequires:	xorg-lib-libXext-devel >= 1.0.99.4
 BuildRequires:	xorg-lib-libXfont-devel >= 1.4.2
 BuildRequires:	xorg-lib-libXi-devel >= 1.2.99.1
 BuildRequires:	xorg-lib-libXmu-devel
@@ -66,7 +67,7 @@ BuildRequires:	xorg-lib-libXxf86dga-devel
 BuildRequires:	xorg-lib-libXxf86misc-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
 BuildRequires:	xorg-lib-libfontenc-devel
-BuildRequires:	xorg-lib-libpciaccess-devel >= 0.8.0
+BuildRequires:	xorg-lib-libpciaccess-devel >= 0.13
 BuildRequires:	xorg-lib-libxkbfile-devel
 BuildRequires:	xorg-lib-libxkbui-devel >= 1.0.2
 BuildRequires:	xorg-lib-xtrans-devel >= 1.2.2
@@ -79,7 +80,7 @@ BuildRequires:	xorg-proto-glproto-devel >= 1.4.10
 BuildRequires:	xorg-proto-inputproto-devel >= 1.9.99.902
 BuildRequires:	xorg-proto-kbproto-devel >= 1.0.3
 BuildRequires:	xorg-proto-printproto-devel
-BuildRequires:	xorg-proto-randrproto-devel >= 1.2.99.3
+BuildRequires:	xorg-proto-randrproto-devel >= 1.3
 BuildRequires:	xorg-proto-recordproto-devel
 BuildRequires:	xorg-proto-renderproto-devel >= 0.11
 BuildRequires:	xorg-proto-resourceproto-devel
@@ -92,8 +93,11 @@ BuildRequires:	xorg-proto-xf86dgaproto-devel >= 2.0.99.1
 BuildRequires:	xorg-proto-xf86driproto-devel >= 2.1.0
 BuildRequires:	xorg-proto-xf86miscproto-devel
 BuildRequires:	xorg-proto-xf86vidmodeproto-devel >= 2.2.99.1
-BuildRequires:	xorg-proto-xproto-devel >= 7.0.17
+BuildRequires:	xorg-proto-xproto-devel >= 7.0.22
 BuildRequires:	xorg-util-util-macros >= 1.10
+Requires(post,postun):	gtk-update-icon-cache
+Requires(post,postun):	hicolor-icon-theme
+Requires:	libjpeg-turbo
 Provides:	vnc-client
 Conflicts:	vnc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -120,6 +124,10 @@ Requires:	xorg-app-rgb
 Requires:	%{name}-utils = %{version}-%{release}
 # for mcookie
 Requires:	util-linux
+Requires:	libjpeg-turbo
+Requires:	xkeyboard-config
+Requires:	xorg-app-xauth
+Requires:	xorg-app-xkbcomp
 Obsoletes:	vnc-server
 
 %description server
@@ -163,45 +171,38 @@ Ten pakiet zawiera moduł libvnc.so dla serwera X.org,
 pozwalający na zdalny dostęp do pulpitu.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+%patch4 -p0
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-
-%{__sed} -i -e 's|^po/Makefile.in||' configure.ac
+%patch8 -p1
 
 cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver
+
 cd unix/xserver
-patch -p1 <../xserver19.patch
+patch -p1 <%{PATCH9}
+cd -
 
 %build
-%{__gettextize}
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-
-%{configure} \
-	--with-system-jpeg
-
+%cmake .
 %{__make}
 
 cd unix/xserver
-%{__automake}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__automake}
+export CXXFLAGS="%{rpmcxxflags} -fpermissive"
 %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 \
@@ -215,7 +216,8 @@ cd unix/xserver
 	--disable-xephyr \
 	--disable-kdrive \
 	--disable-xfbdev \
-	--disable-dri2 \
+	--disable-dri \
+	--enable-dri2 \
 	--with-pic \
 	--disable-static \
 	--disable-xinerama \
@@ -227,11 +229,10 @@ cd unix/xserver
 	--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
+	--with-xkb-output=/var/lib/xkb \
+	--disable-unit-tests
 
 %{__make}
 cd -
@@ -261,6 +262,12 @@ install media/icons/tigervnc_32.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/32x32/ap
 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
 
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/vncserver
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/vncserver
+
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}
+
 %find_lang %{name}
 
 %clean
@@ -268,15 +275,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 [ ! -x /usr/bin/update-desktop-database ] || %update_desktop_database_post
-[ ! -x /usr/bin/gtk-update-icon-cache ] || %update_icon_cache hicolor
+%update_icon_cache hicolor
 
 %postun
 [ ! -x /usr/bin/update-desktop-database ] || %update_desktop_database_postun
-[ ! -x /usr/bin/gtk-update-icon-cache ] || %update_icon_cache hicolor
+%update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc doc/*
+%doc README.txt doc/*
 %attr(755,root,root) %{_bindir}/vncviewer
 %{_mandir}/man1/vncviewer.1*
 %{_desktopdir}/tigervnc.desktop
@@ -287,6 +294,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/Xvnc
 %attr(755,root,root) %{_bindir}/vncserver
 %attr(755,root,root) %{_bindir}/x0vncserver
+%attr(754,root,root) /etc/rc.d/init.d/vncserver
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vncserver
 %{_mandir}/man1/Xvnc.1*
 %{_mandir}/man1/vncserver.1*
 %{_mandir}/man1/x0vncserver.1*