-# TODO:
-# - tigervnc.init
-
-%define xversion 1.12.0
+%define xversion 1.14.0
Summary: A TigerVNC remote display system
Summary(pl.UTF-8): System zdalnego dostępu TigerVNC
Name: tigervnc
-Version: 1.2.0
-Release: 5
+Version: 1.3.0
+Release: 2
License: GPL v2
Group: X11/Applications/Networking
-Source0: http://dl.sourceforge.net/tigervnc/1.2.0/%{name}-%{version}.tar.gz
-# Source0-md5: 3a5755b4ed600a81c3a17976c6f8420d
+Source0: http://download.sourceforge.net/tigervnc/%{name}-%{version}.tar.bz2
+# Source0-md5: a5158228e64d14496821a39bf3851f1b
Source1: %{name}.desktop
+Source2: vncserver.init
+Source3: vncserver.sysconfig
Patch0: %{name}-cookie.patch
Patch1: %{name}-ldnow.patch
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
+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: xserver.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: fltk-devel
BuildRequires: gnutls-devel
BuildRequires: libjpeg-turbo-devel
BuildRequires: xorg-xserver-server-source >= %{xversion}
# for mcookie
Requires: util-linux
Requires: libjpeg-turbo
+Requires: xkeyboard-config
Requires: xorg-app-xauth
+Requires: xorg-app-xkbcomp
Obsoletes: vnc-server
%description server
%patch0 -p1
%patch1 -p1
%patch2 -p1
-#patch3 -p1
-%patch4 -p1
-%patch5 -p0
+%patch3 -p1
+%patch4 -p0
+%patch5 -p1
+%patch6 -p1
%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
+patch -p1 <%{PATCH9}
cd -
-%patch6 -p1
-%patch10 -p1
%build
%cmake .
install media/icons/tigervnc_48.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/apps/tigervnc.png
install media/icons/tigervnc.svg $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/tigervnc.svg
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/vncserver
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/vncserver
+
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}
+
%find_lang %{name}
%clean
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc doc/*
+%doc README.txt doc/*
%attr(755,root,root) %{_bindir}/vncviewer
%{_mandir}/man1/vncviewer.1*
%{_desktopdir}/tigervnc.desktop
%attr(755,root,root) %{_bindir}/Xvnc
%attr(755,root,root) %{_bindir}/vncserver
%attr(755,root,root) %{_bindir}/x0vncserver
+%attr(754,root,root) /etc/rc.d/init.d/vncserver
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vncserver
%{_mandir}/man1/Xvnc.1*
%{_mandir}/man1/vncserver.1*
%{_mandir}/man1/x0vncserver.1*