X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=tigervnc.spec;h=9d91ce441ccb81c2abede30ad63ab6fc1cb7c3c1;hb=603138b1bb7f5002c032c306474d3f2cab33f6df;hp=7768a396a6555e4ee94b2aa7166182c532c9cd65;hpb=268aac4068019167c03c045534c08261fa12af49;p=packages%2Ftigervnc.git diff --git a/tigervnc.spec b/tigervnc.spec index 7768a39..9d91ce4 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -1,46 +1,48 @@ # TODO: # - tigervnc.init -%define snap r4159 -%define xversion 1.9 +%define xversion 1.12.0 Summary: A TigerVNC remote display system Summary(pl.UTF-8): System zdalnego dostępu TigerVNC Name: tigervnc -Version: 1.0.90 -Release: 10 +Version: 1.2.0 +Release: 0.1 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: 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 +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 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 @@ -53,7 +55,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 @@ -67,7 +69,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 @@ -80,7 +82,7 @@ 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 +BuildRequires: xorg-proto-randrproto-devel >= 1.3 BuildRequires: xorg-proto-recordproto-devel BuildRequires: xorg-proto-renderproto-devel >= 0.11 BuildRequires: xorg-proto-resourceproto-devel @@ -93,8 +95,11 @@ 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) @@ -121,6 +126,8 @@ 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 @@ -164,46 +171,40 @@ 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 +#patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 +%patch5 -p0 %patch7 -p1 %patch8 -p1 - -%{__sed} -i -e 's|^po/Makefile.in||' configure.ac +%patch9 -p1 +%patch11 -p1 cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver cd unix/xserver -patch -p1 <../xserver19.patch -%patch3 -p1 +patch -p1 <../xserver110.patch +cd - +%patch6 -p1 +%patch10 -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 \ - --disable-builddocs \ --without-xmlto \ --without-fop \ --without-doxygen \ @@ -217,7 +218,8 @@ cd unix/xserver --disable-xephyr \ --disable-kdrive \ --disable-xfbdev \ - --disable-dri2 \ + --disable-dri \ + --enable-dri2 \ --with-pic \ --disable-static \ --disable-xinerama \ @@ -229,11 +231,10 @@ cd unix/xserver --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 + --with-xkb-output=/var/lib/xkb \ + --disable-unit-tests %{__make} cd - @@ -270,11 +271,11 @@ rm -rf $RPM_BUILD_ROOT %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)