-# TODO:
-# - tigervnc.init
-
-%define snap r4237
-%define xversion 1.10.0
+%define xversion 1.16.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}.3
-Release: 20
+Version: 1.6.0
+Release: 4
License: GPL v2
Group: X11/Applications/Networking
-#Source0: %{name}-%{version}-%{snap}.tar.bz2
-#Source0: http://dl.sourceforge.net/tigervnc/1.0.90%20(1.1beta1)/%{name}-%{version}.tar.gz
-Source0: %{name}-%{version}.tar.gz
-# Source0-md5: 90db4d34543e20f053e2ac93745af7e3
+Source0: https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz?/%{name}-%{version}.tar.gz
+# Source0-md5: 78b736445781d86c48e942465a391ccc
Source1: %{name}.desktop
+Source2: vncserver.init
+Source3: vncserver.sysconfig
+Source4: vncserver.target
+Source5: vncserver-service-generator
Patch0: %{name}-cookie.patch
-Patch1: %{name}-ldnow.patch
-Patch2: %{name}-rh102434.patch
-Patch5: %{name}-viewer-reparent.patch
-Patch6: %{name}-as-needed.patch
+Patch3: %{name}-as-needed.patch
+Patch5: %{name}-rh692048.patch
+Patch8: tigervnc-xstartup.patch
+Patch9: xserver.patch
+Patch10: tigervnc-getmaster.patch
+Patch11: tigervnc-xserver-1.18.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}
BuildRequires: perl-base
BuildRequires: pixman-devel >= 0.16.0
BuildRequires: pkgconfig >= 1:0.19
+BuildRequires: rpmbuild(macros) >= 1.647
BuildRequires: xorg-app-mkfontscale
BuildRequires: xorg-font-font-util >= 1.1
BuildRequires: xorg-lib-libX11-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-libxshmfence-devel >= 1.1
BuildRequires: xorg-lib-xtrans-devel >= 1.2.2
BuildRequires: xorg-proto-bigreqsproto-devel >= 1.1.0
BuildRequires: xorg-proto-damageproto-devel >= 1.1
+BuildRequires: xorg-proto-dri3proto-devel >= 1.0
BuildRequires: xorg-proto-fixesproto-devel >= 4.1
BuildRequires: xorg-proto-fontcacheproto-devel
BuildRequires: xorg-proto-fontsproto-devel
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-presentproto-devel >= 1.0
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
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
Summary: VNC X server - TigerVNC version
Summary(pl.UTF-8): X serwer VNC - wersja TigerVNC
Group: X11/Applications/Networking
+Requires(post,preun): /sbin/chkconfig
+Requires(post,preun,postun): systemd-units >= 38
Requires: xorg-app-rgb
# for vncpasswd tool
Requires: %{name}-utils = %{version}-%{release}
# for mcookie
Requires: util-linux
Requires: libjpeg-turbo
+Requires: systemd-units >= 38
+Requires: xkeyboard-config
+Requires: xorg-app-xauth
+Requires: xorg-app-xkbcomp
Obsoletes: vnc-server
%description server
%prep
%setup -q
-# -n %{name}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch3 -p1
%patch5 -p1
+%patch8 -p1
+%patch10 -p1
cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver
cd unix/xserver
-patch -p1 <../xserver110.patch
-cd -
-%patch6 -p1
+%patch9 -p1
+%patch11 -p3
%build
-%{__gettextize}
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-
-%{configure} \
- --with-system-jpeg
-
-%{__make}
+%cmake .
+%{__make} -j1
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-xephyr \
--disable-kdrive \
--disable-xfbdev \
- --disable-dri2 \
+ --disable-dri \
+ --enable-dri2 \
+ --enable-dri3 \
--with-pic \
--disable-static \
--disable-xinerama \
--disable-composite \
+ --disable-wayland \
+ --disable-xwayland \
--enable-glx \
--enable-glx-tls \
--enable-aiglx \
--enable-record \
--disable-xfake \
--enable-secure-rpc \
- --with-xkb-output=/var/lib/xkb
+ --with-xkb-output=/var/lib/xkb \
+ --disable-unit-tests
-%{__make}
+%{__make} -j1
cd -
cd media
-%{__make}
+%{__make} -j1
%install
rm -rf $RPM_BUILD_ROOT
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
+
+install -d $RPM_BUILD_ROOT{%{systemdunitdir},/lib/systemd/system-generators}
+install -p %{SOURCE4} $RPM_BUILD_ROOT%{systemdunitdir}/vncserver.target
+install -p %{SOURCE5} $RPM_BUILD_ROOT/lib/systemd/system-generators/vncserver-service-generator
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vncserver.service
+
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}
+
%find_lang %{name}
%clean
[ ! -x /usr/bin/update-desktop-database ] || %update_desktop_database_postun
%update_icon_cache hicolor
+%post server
+/sbin/chkconfig --add vncserver
+%service vncserver restart "VNC server"
+NORESTART=1
+%systemd_post vncserver.target
+
+%preun server
+if [ "$1" = "0" ]; then
+ %service vncserver stop
+ /sbin/chkconfig --del vncserver
+fi
+%systemd_preun vncserver.target
+
+%postun server
+%systemd_reload
+
+%triggerpostun server -- tigervnc-server < 1.3.0-5
+[ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm
+[ ${RPM_ENABLE_SYSTEMD_SERVICE:-yes} = no ] && return 1
+export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog
+if [ "$(echo /etc/rc.d/rc[0-6].d/S[0-9][0-9]vncserver)" != "/etc/rc.d/rc[0-6].d/S[0-9][0-9]vncserver" ]; then
+ /bin/systemctl --quiet enable vncserver.target || :
+fi
+
%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
+%attr(755,root,root) /lib/systemd/system-generators/vncserver-service-generator
+%{systemdunitdir}/vncserver.target
+%{systemdunitdir}/vncserver.service
%{_mandir}/man1/Xvnc.1*
%{_mandir}/man1/vncserver.1*
%{_mandir}/man1/x0vncserver.1*
projects / packages / tigervnc.git / blobdiff