X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=tigervnc.spec;h=90eb2ef1adf842b38dd726a2ea32c3a31917b200;hb=c1a965fe6177f6b7ff44fb0be874f01facdda16f;hp=af22e3a660f0a81f6113f651a04a4c360af6b137;hpb=358317c15016d5fb778e0b191d2f3c67a3360c9f;p=packages%2Ftigervnc.git

diff --git a/tigervnc.spec b/tigervnc.spec
index af22e3a..90eb2ef 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,26 +1,35 @@
 # TODO:
 # - tigervnc.init
 
-%define		snap		r4237
-%define		xversion	1.10.0
+%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:	0.1
+Version:	1.2.0
+Release:	16
 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:	171a4310bc5bc8d5ab5a83c404cf551b
+Source0:	http://dl.sourceforge.net/tigervnc/1.2.0/%{name}-%{version}.tar.gz
+# Source0-md5:	3a5755b4ed600a81c3a17976c6f8420d
 Source1:	%{name}.desktop
 Patch0:		%{name}-cookie.patch
 Patch1:		%{name}-ldnow.patch
 Patch2:		%{name}-rh102434.patch
-Patch5:		%{name}-viewer-reparent.patch
-Patch6:		%{name}-as-needed.patch
-Patch7:		%{name}-110patch.patch
+Patch3:		%{name}-viewer-reparent.patch
+Patch4:		%{name}-as-needed.patch
+Patch5:		%{name}-ipv6.patch
+Patch6:		%{name}-xorg111.patch
+Patch7:		%{name}-rh692048.patch
+Patch8:		gnutls3.patch
+Patch9:		no-bashizm.patch
+Patch10:	xorg112.patch
+Patch11:	cmake-mandir.patch
+Patch12:	sed-all.patch
+Patch13:	xorg113.patch
+Patch14:	xserver113.patch
+Patch15:	format-security.patch
+Patch16:	xorg114.patch
 URL:		http://www.tigervnc.com/
 BuildRequires:	ImageMagick
 BuildRequires:	ImageMagick-coder-png
@@ -28,7 +37,7 @@ BuildRequires:	ImageMagick-coder-svg
 BuildRequires:	Mesa-libGL-devel >= 7.8.1
 BuildRequires:	cpp
 BuildRequires:	gnutls-devel
-BuildRequires:	libjpeg-devel
+BuildRequires:	libjpeg-turbo-devel
 BuildRequires:	xorg-xserver-server-source >= %{xversion}
 BuildRequires:	zlib-devel
 # xserver BRs, should match xorg-xserver-server.spec
@@ -38,6 +47,7 @@ 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
@@ -64,7 +74,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
@@ -77,7 +87,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
@@ -90,10 +100,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 +131,8 @@ Requires:	xorg-app-rgb
 Requires:	%{name}-utils = %{version}-%{release}
 # for mcookie
 Requires:	util-linux
+Requires:	libjpeg-turbo
+Requires:	xorg-app-xauth
 Obsoletes:	vnc-server
 
 %description server
@@ -163,43 +176,44 @@ 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
-%patch5 -p1
-%patch6 -p1
+#patch3 -p1
+%patch4 -p1
+%patch5 -p0
 %patch7 -p1
-
-%{__sed} -i -e 's|^po/Makefile.in||' configure.ac
+%patch8 -p1
+%patch9 -p1
+%patch11 -p1
+%patch12 -p1
+%patch15 -p1
 
 cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver
 cd unix/xserver
-patch -p1 <../xserver110.patch
+patch -p1 <%{PATCH14}
+cd -
+%patch6 -p1
+%patch10 -p1
+%patch13 -p1
+%patch16 -p1
 
 %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 \
@@ -213,7 +227,8 @@ cd unix/xserver
 	--disable-xephyr \
 	--disable-kdrive \
 	--disable-xfbdev \
-	--disable-dri2 \
+	--disable-dri \
+	--enable-dri2 \
 	--with-pic \
 	--disable-static \
 	--disable-xinerama \
@@ -225,11 +240,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 -