- no more snap

[packages/tigervnc.git] / tigervnc.spec

diff --git a/tigervnc.spec b/tigervnc.spec
index 908876379453edc0906d12f1edb2eba5055fa1ec..dfce0350ac202db0c4a845e572e8ef6b10fefe4d 100644 (file)
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,27 +1,23 @@
 # TODO:
 # - tigervnc.init
 
-%define                snap            r4237
 %define                xversion        1.10.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.1.0
+Release:       3
 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.1.0/%{name}-%{version}.tar.gz
+# Source0-md5: 1a5598b4a2ac530fb51411438959e11e
 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
 URL:           http://www.tigervnc.com/
 BuildRequires: ImageMagick
 BuildRequires: ImageMagick-coder-png
@@ -29,7 +25,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 +35,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
@@ -95,6 +92,7 @@ BuildRequires:        xorg-proto-xproto-devel >= 7.0.17
 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 +119,7 @@ Requires:   xorg-app-rgb
 Requires:      %{name}-utils = %{version}-%{release}
 # for mcookie
 Requires:      util-linux
+Requires:      libjpeg-turbo
 Obsoletes:     vnc-server
 
 %description server
@@ -164,19 +163,17 @@ 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
-%patch7 -p1
-
-%{__sed} -i -e 's|^po/Makefile.in||' configure.ac
+%patch3 -p1
+%patch4 -p1
 
 cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver
 cd unix/xserver
 patch -p1 <../xserver110.patch
+cd -
 
 %build
 %{__gettextize}