# TODO:
# - tigervnc.init
-%define snap r4159
-%define xversion 1.9
+%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
-Release: 9
+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: bd83717c960fb9e585387948b5cb41e2
+Source0: http://dl.sourceforge.net/tigervnc/1.1.0/%{name}-%{version}.tar.gz
+# Source0-md5: 1a5598b4a2ac530fb51411438959e11e
Source1: %{name}.desktop
-Patch0: tigervnc-cookie.patch
-Patch1: tigervnc-ldnow.patch
-Patch2: tigervnc-rh102434.patch
-Patch3: tigervnc-rh611677-generate_modkeymap-max_keys.patch
-Patch4: tigervnc-rh611677.patch
-Patch5: tigervnc-rh633931.patch
-Patch6: tigervnc-viewer-reparent.patch
-Patch7: tigervnc-as-needed.patch
-Patch8: tigervnc-options-dialog.patch
+Patch0: %{name}-cookie.patch
+Patch1: %{name}-ldnow.patch
+Patch2: %{name}-rh102434.patch
+Patch3: %{name}-viewer-reparent.patch
+Patch4: %{name}-as-needed.patch
URL: http://www.tigervnc.com/
BuildRequires: ImageMagick
BuildRequires: ImageMagick-coder-png
BuildRequires: ImageMagick-coder-svg
+BuildRequires: Mesa-libGL-devel >= 7.8.1
BuildRequires: cpp
BuildRequires: gnutls-devel
-BuildRequires: libjpeg-devel
-BuildRequires: zlib-devel
+BuildRequires: libjpeg-turbo-devel
BuildRequires: xorg-xserver-server-source >= %{xversion}
+BuildRequires: zlib-devel
# xserver BRs, should match xorg-xserver-server.spec
-BuildRequires: Mesa-libGL-devel >= 7.8.1
# for glx headers
BuildRequires: OpenGL-GLX-devel
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
BuildRequires: xorg-lib-libXaw-devel
BuildRequires: xorg-lib-libXdamage-devel
BuildRequires: xorg-lib-libXdmcp-devel
-BuildRequires: xorg-lib-libXext-devel >= 1.0.99.4
+BuildRequires: xorg-lib-libXext-devel >= 1.0.99.4
BuildRequires: xorg-lib-libXfont-devel >= 1.4.2
BuildRequires: xorg-lib-libXi-devel >= 1.2.99.1
BuildRequires: xorg-lib-libXmu-devel
BuildRequires: xorg-proto-xf86vidmodeproto-devel >= 2.2.99.1
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)
Requires: %{name}-utils = %{version}-%{release}
# for mcookie
Requires: util-linux
+Requires: libjpeg-turbo
Obsoletes: vnc-server
%description server
pozwalający na zdalny dostęp do pulpitu.
%prep
-%setup -q -n %{name}
+%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-
-%{__sed} -i -e 's|^po/Makefile.in||' configure.ac
cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver
cd unix/xserver
-patch -p1 <../xserver19.patch
-%patch3 -p1
+patch -p1 <../xserver110.patch
+cd -
%build
%{__gettextize}
--disable-config-dbus \
--disable-config-hal \
--disable-config-udev \
- --disable-builddocs \
--without-xmlto \
--without-fop \
--without-doxygen \
--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
%{__make}
%post
[ ! -x /usr/bin/update-desktop-database ] || %update_desktop_database_post
-[ ! -x /usr/bin/gtk-update-icon-cache ] || %update_icon_cache hicolor
+%update_icon_cache hicolor
%postun
[ ! -x /usr/bin/update-desktop-database ] || %update_desktop_database_postun
-[ ! -x /usr/bin/gtk-update-icon-cache ] || %update_icon_cache hicolor
+%update_icon_cache hicolor
%files -f %{name}.lang
%defattr(644,root,root,755)