- rel 5

[packages/tigervnc.git] / tigervnc.spec

diff --git a/tigervnc.spec b/tigervnc.spec
index 908876379453edc0906d12f1edb2eba5055fa1ec..e85c7b983fdf184fcb8c316f7bb273448e51934a 100644 (file)
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,27 +1,31 @@
 # TODO:
 # - tigervnc.init
 
-%define                snap            r4237
-%define                xversion        1.10.0
+%define                xversion        1.12.0
 
 Summary:       A TigerVNC remote display system
 Summary(pl.UTF-8):     System zdalnego dostępu TigerVNC
 Name:          tigervnc
-Version:       1.0.90
-# leave this '16' alone, change only last number
-Release:       16.%{snap}.1
+Version:       1.2.0
+Release:       5
 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
 URL:           http://www.tigervnc.com/
 BuildRequires: ImageMagick
 BuildRequires: ImageMagick-coder-png
@@ -29,7 +33,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
@@ -39,6 +43,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
@@ -65,7 +70,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
@@ -78,7 +83,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
@@ -91,10 +96,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)
@@ -121,6 +127,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
@@ -164,36 +172,35 @@ 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
 
 cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver
 cd unix/xserver
 patch -p1 <../xserver110.patch
+cd -
+%patch6 -p1
+%patch10 -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" \
@@ -213,7 +220,8 @@ cd unix/xserver
        --disable-xephyr \
        --disable-kdrive \
        --disable-xfbdev \
-       --disable-dri2 \
+       --disable-dri \
+       --enable-dri2 \
        --with-pic \
        --disable-static \
        --disable-xinerama \
@@ -227,7 +235,8 @@ cd unix/xserver
        --enable-record \
        --disable-xfake \
        --enable-secure-rpc \
-       --with-xkb-output=/var/lib/xkb
+       --with-xkb-output=/var/lib/xkb \
+       --disable-unit-tests
 
 %{__make}
 cd -