- rel 4

[packages/tigervnc.git] / tigervnc.spec

diff --git a/tigervnc.spec b/tigervnc.spec
index 81e8112a952d0e72843f66036026120fc813dfc4..89cca9a1520893829c98335d6eab877605a3dffd 100644 (file)
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,17 +1,17 @@
 # TODO:
 # - tigervnc.init
 
-%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.1.0
+Version:       1.2.0
 Release:       4
 License:       GPL v2
 Group:         X11/Applications/Networking
-Source0:       http://dl.sourceforge.net/tigervnc/1.1.0/%{name}-%{version}.tar.gz
-# Source0-md5: 1a5598b4a2ac530fb51411438959e11e
+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
@@ -19,6 +19,13 @@ Patch2:              %{name}-rh102434.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
@@ -63,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
@@ -76,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
@@ -89,7 +96,7 @@ 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
@@ -121,6 +128,7 @@ Requires:   %{name}-utils = %{version}-%{release}
 # for mcookie
 Requires:      util-linux
 Requires:      libjpeg-turbo
+Requires:      xorg-app-xauth
 Obsoletes:     vnc-server
 
 %description server
@@ -168,31 +176,31 @@ pozwalający na zdalny dostęp do pulpitu.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+#patch3 -p1
 %patch4 -p1
 %patch5 -p0
+%patch7 -p1
+%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" \
@@ -212,7 +220,8 @@ cd unix/xserver
        --disable-xephyr \
        --disable-kdrive \
        --disable-xfbdev \
-       --disable-dri2 \
+       --disable-dri \
+       --enable-dri2 \
        --with-pic \
        --disable-static \
        --disable-xinerama \
@@ -226,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 -