X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=tigervnc.spec;h=90eb2ef1adf842b38dd726a2ea32c3a31917b200;hb=c1a965fe6177f6b7ff44fb0be874f01facdda16f;hp=da0b554682a0562e45f61f4f408af0b45dfd7c80;hpb=12ef4f37a3d9248afea5bce52221b08980709642;p=packages%2Ftigervnc.git diff --git a/tigervnc.spec b/tigervnc.spec index da0b554..90eb2ef 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -1,34 +1,53 @@ # TODO: # - tigervnc.init -# - descriptions! -%define snap r4159 -%define xversion 1.9.0.901 +%define xversion 1.14.0 Summary: A TigerVNC remote display system Summary(pl.UTF-8): System zdalnego dostępu TigerVNC Name: tigervnc -Version: 1.0.90 -Release: 0.1 +Version: 1.2.0 +Release: 16 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.2.0/%{name}-%{version}.tar.gz +# Source0-md5: 3a5755b4ed600a81c3a17976c6f8420d Source1: %{name}.desktop +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 +Patch13: xorg113.patch +Patch14: xserver113.patch +Patch15: format-security.patch +Patch16: xorg114.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: libjpeg-devel +BuildRequires: gnutls-devel +BuildRequires: libjpeg-turbo-devel +BuildRequires: xorg-xserver-server-source >= %{xversion} BuildRequires: zlib-devel -BuildRequires: xorg-xserver-server-source = %{xversion} # 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 @@ -41,7 +60,7 @@ BuildRequires: xorg-lib-libXau-devel 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 @@ -55,7 +74,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 @@ -68,8 +87,8 @@ 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 -%{?with_record:BuildRequires: xorg-proto-recordproto-devel} +BuildRequires: xorg-proto-randrproto-devel >= 1.3 +BuildRequires: xorg-proto-recordproto-devel BuildRequires: xorg-proto-renderproto-devel >= 0.11 BuildRequires: xorg-proto-resourceproto-devel BuildRequires: xorg-proto-scrnsaverproto-devel >= 1.1.0 @@ -81,27 +100,27 @@ 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 +Requires: libjpeg-turbo Provides: vnc-client Conflicts: vnc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _xserverver %(LC_ALL=C rpm -q --qf '%{V}' xorg-xserver-server-source 2> /dev/null) + %description -VNC is a great client/server software package allowing remote network -access to graphical desktops. TightVNC is optimized to work over slow -network connections such as low-speed modem links. While oroginal VNC -may be verry slow when your connection is not fast enough, with -TightVNC you can work remotely almost in real time in most -environments. +TigerVNC is a suite of VNC servers and clients that have a focus on +performance and remote display functionality. Originally this software +was based on the (never released) VNC 4 branch of TightVNC. %description -l pl.UTF-8 -VNC jest wspaniałym programem klient/serwer umożliwiającym zdalny -dostęp do graficznych pulpitów. TightVNC jest zoptymalizowany do pracy -przy wolniejszych połączeniach sieciowych takich jak połączenia -modemowe. Oryginalne VNC może pracować wolno kiedy połączenie nie jest -wystarczająco szybkie, natomiast z TightVNC możesz pracować zdalnie -niemal w czasie rzeczywistym. +TigerVNC to zestaw serwerów i klientów VNC, które koncentrują się +na wydajności i funkcjonalności zdalnego wyświetlania. Pierwotnie +oprogramowanie oparte było na (nigdy nie wydanej) +gałęzi VNC 4 TightVNC. %package server Summary: VNC X server - TigerVNC version @@ -112,13 +131,15 @@ Requires: xorg-app-rgb Requires: %{name}-utils = %{version}-%{release} # for mcookie Requires: util-linux +Requires: libjpeg-turbo +Requires: xorg-app-xauth Obsoletes: vnc-server %description server -This package contains VNC X server in tightvnc version. +This package contains VNC X server in TigerVNC version. %description server -l pl.UTF-8 -Ten pakiet zawiera X serwer VNC w wersji tightvnc. +Ten pakiet zawiera X serwer VNC w wersji TigerVNC. %package utils Summary: Additional utilities for TigerVNC @@ -127,53 +148,77 @@ Group: X11/Applications/Networking Obsoletes: vnc-utils %description utils -This package contains additional tightvnc utilities: vncconnect and -vncpasswd. vncconnect tells Xvnc server to connect to a listening -tightvnc viewer. vncpasswd generates password file (both on server and -viewer side). +This package contains additional TigerVNC utilities: vncconfig and +vncpasswd. vncconfig is used to configure and control a running +instance of Xvnc, or any other X server with the VNC extension. +vncpasswd generates password file (both on server and viewer side). %description utils -l pl.UTF-8 -Ten pakiet zawiera dodatkowe narzędzia do tightvnc: vncconnect i -vncpasswd. vncconnect służy do połączenia serwera Xvnc z nasłuchującym -vncviewerem. vncpasswd służy to tworzenia pliku z hasłem (zarówno po +Ten pakiet zawiera dodatkowe narzędzia do tightvnc: vncconfig i +vncpasswd. vncconfig służy do konfigurowania i kontroli działającej +instancji Xvnc lub innego serwera X z rozszerzeniem VNC. +vncpasswd służy to tworzenia pliku z hasłem (zarówno po stronie serwera, jak i przeglądarki). %package -n xorg-xserver-libvnc Summary: TigerVNC module for X.org server +Summary(pl.UTF-8): Moduł TigerVNC dla servera X.org Group: X11/Servers -Requires: xorg-xserver-server = %{xversion} +%requires_eq_to xorg-xserver-server xorg-xserver-server-source Provides: xorg-xserver-module(vnc) %description -n xorg-xserver-libvnc This package contains libvnc.so module for X.org server, allowing others to access the desktop on your machine. +%description -n xorg-xserver-libvnc -l pl.UTF-8 +Ten pakiet zawiera moduł libvnc.so dla serwera X.org, +pozwalający na zdalny dostęp do pulpitu. + %prep -%setup -q -n %{name} -%{__sed} -i -e 's|^po/Makefile.in||' configure.ac +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +#patch3 -p1 +%patch4 -p1 +%patch5 -p0 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch11 -p1 +%patch12 -p1 +%patch15 -p1 -cp -a %{_usrsrc}/xorg-xserver-server-%{xversion}/* unix/xserver +cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver cd unix/xserver -patch -p1 <../xserver19.patch -#%patch11 -p1 +patch -p1 <%{PATCH14} +cd - +%patch6 -p1 +%patch10 -p1 +%patch13 -p1 +%patch16 -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" \ + --disable-config-dbus \ + --disable-config-hal \ + --disable-config-udev \ + --without-xmlto \ + --without-fop \ + --without-doxygen \ + --disable-devel-docs \ + --with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \ --disable-xorg \ --disable-xnest \ --disable-xvfb \ @@ -181,36 +226,35 @@ cd unix/xserver --disable-xwin \ --disable-xephyr \ --disable-kdrive \ + --disable-xfbdev \ + --disable-dri \ + --enable-dri2 \ --with-pic \ --disable-static \ --disable-xinerama \ --disable-composite \ - --with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \ - --with-fontdir=%{_datadir}/X11/fonts \ - --with-xkb-output=%{_localstatedir}/lib/xkb \ - --enable-install-libxf86config \ - --disable-dri2 \ --enable-glx \ - --disable-config-dbus \ - --disable-config-hal \ - --disable-config-udev \ - --with-dri-driver-path=%{_libdir}/dri \ - --without-xmlto \ - --without-fop \ - --without-doxygen \ - --disable-devel-docs \ - --disable-builddocs + --enable-glx-tls \ + --enable-aiglx \ + --enable-dga \ + --enable-glx-tls \ + --enable-install-libxf86config \ + --enable-record \ + --disable-xfake \ + --enable-secure-rpc \ + --with-xkb-output=/var/lib/xkb \ + --disable-unit-tests %{__make} cd - -# Build icons cd media %{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_sysconfdir}} +install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/{16x16,22x22,24x24,32x32,48x48,scalable}/apps \ + $RPM_BUILD_ROOT%{_desktopdir} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -220,31 +264,50 @@ cd unix/xserver/hw/vnc DESTDIR=$RPM_BUILD_ROOT cd - +install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} + +install media/icons/tigervnc_16.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/16x16/apps/tigervnc.png +install media/icons/tigervnc_22.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/22x22/apps/tigervnc.png +install media/icons/tigervnc_24.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/24x24/apps/tigervnc.png +install media/icons/tigervnc_32.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/32x32/apps/tigervnc.png +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 + +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT -%files +%post +[ ! -x /usr/bin/update-desktop-database ] || %update_desktop_database_post +%update_icon_cache hicolor + +%postun +[ ! -x /usr/bin/update-desktop-database ] || %update_desktop_database_postun +%update_icon_cache hicolor + +%files -f %{name}.lang %defattr(644,root,root,755) %doc doc/* %attr(755,root,root) %{_bindir}/vncviewer %{_mandir}/man1/vncviewer.1* -%{_desktopdir}/tightvnc.desktop -%{_pixmapsdir}/tightvnc.png +%{_desktopdir}/tigervnc.desktop +%{_iconsdir}/hicolor/*/apps/tigervnc.* %files server %defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/tightvncserver.conf %attr(755,root,root) %{_bindir}/Xvnc -%attr(755,root,root) %{_bindir}/x0vncserver %attr(755,root,root) %{_bindir}/vncserver -%{_datadir}/vnc +%attr(755,root,root) %{_bindir}/x0vncserver %{_mandir}/man1/Xvnc.1* -%{_mandir}/man1/x0vncserver.1* %{_mandir}/man1/vncserver.1* +%{_mandir}/man1/x0vncserver.1* %files utils %defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/vncconfig %attr(755,root,root) %{_bindir}/vncpasswd +%{_mandir}/man1/vncconfig.1* %{_mandir}/man1/vncpasswd.1* %files -n xorg-xserver-libvnc