- release 4 (by relup.sh)

[packages/tigervnc.git] / tigervnc.spec

diff --git a/tigervnc.spec b/tigervnc.spec
index e2ccf4e3f9ae71432605a73f67968b7966430c02..adbdf88adbdfaa45f432f629ce44a19377eb24eb 100644 (file)
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,31 +1,26 @@
-%define                xversion        1.14.0
+%define                xversion        1.16.0
 
 Summary:       A TigerVNC remote display system
 Summary(pl.UTF-8):     System zdalnego dostępu TigerVNC
 Name:          tigervnc
-Version:       1.3.0
-Release:       6
+Version:       1.6.0
+Release:       4
 License:       GPL v2
 Group:         X11/Applications/Networking
-Source0:       http://download.sourceforge.net/tigervnc/%{name}-%{version}.tar.bz2
-# Source0-md5: a5158228e64d14496821a39bf3851f1b
+Source0:       https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz?/%{name}-%{version}.tar.gz
+# Source0-md5: 78b736445781d86c48e942465a391ccc
 Source1:       %{name}.desktop
 Source2:       vncserver.init
 Source3:       vncserver.sysconfig
 Source4:       vncserver.target
 Source5:       vncserver-service-generator
 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:                tigervnc-xstartup.patch
-Patch10:       xserver.patch
-Patch11:       tigervnc-key_is_down.patch
+Patch8:                tigervnc-xstartup.patch
+Patch9:                xserver.patch
+Patch10:       tigervnc-getmaster.patch
+Patch11:       tigervnc-xserver-1.18.patch
 URL:           http://www.tigervnc.com/
 BuildRequires: ImageMagick
 BuildRequires: ImageMagick-coder-png
@@ -75,15 +70,18 @@ BuildRequires:      xorg-lib-libfontenc-devel
 BuildRequires: xorg-lib-libpciaccess-devel >= 0.13
 BuildRequires: xorg-lib-libxkbfile-devel
 BuildRequires: xorg-lib-libxkbui-devel >= 1.0.2
+BuildRequires: xorg-lib-libxshmfence-devel >= 1.1
 BuildRequires: xorg-lib-xtrans-devel >= 1.2.2
 BuildRequires: xorg-proto-bigreqsproto-devel >= 1.1.0
 BuildRequires: xorg-proto-damageproto-devel >= 1.1
+BuildRequires: xorg-proto-dri3proto-devel >= 1.0
 BuildRequires: xorg-proto-fixesproto-devel >= 4.1
 BuildRequires: xorg-proto-fontcacheproto-devel
 BuildRequires: xorg-proto-fontsproto-devel
 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-presentproto-devel >= 1.0
 BuildRequires: xorg-proto-printproto-devel
 BuildRequires: xorg-proto-randrproto-devel >= 1.3
 BuildRequires: xorg-proto-recordproto-devel
@@ -181,26 +179,19 @@ pozwalający na zdalny dostęp do pulpitu.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 %patch3 -p1
-%patch4 -p0
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch11 -p1
+%patch10 -p1
 
 cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver
-
 cd unix/xserver
-patch -p1 <%{PATCH10}
-cd -
+%patch9 -p1
+%patch11 -p3
 
 %build
 %cmake .
-%{__make}
+%{__make} -j1
 
 cd unix/xserver
 %{__aclocal} -I m4
@@ -228,10 +219,13 @@ export CXXFLAGS="%{rpmcxxflags} -fpermissive"
        --disable-xfbdev \
        --disable-dri \
        --enable-dri2 \
+       --enable-dri3 \
        --with-pic \
        --disable-static \
        --disable-xinerama \
        --disable-composite \
+       --disable-wayland \
+       --disable-xwayland \
        --enable-glx \
        --enable-glx-tls \
        --enable-aiglx \
@@ -244,11 +238,11 @@ export CXXFLAGS="%{rpmcxxflags} -fpermissive"
        --with-xkb-output=/var/lib/xkb \
        --disable-unit-tests
 
-%{__make}
+%{__make} -j1
 cd -
 
 cd media
-%{__make}
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT