|
@@ -1,28 +1,36 @@
|
|
|
+%bcond_with systemd
|
|
|
+
|
|
|
Name: tigervnc
|
|
|
Version: 1.10.1
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Summary: A TigerVNC remote display system
|
|
|
-Group: User Interface/Desktops
|
|
|
-
|
|
|
+Group: network
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
|
|
|
License: GPLv2+
|
|
|
URL: http://www.tigervnc.com
|
|
|
-
|
|
|
Source0: https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
|
|
Source1: vncserver.service.upstart
|
|
|
Source2: vncserver.sysconfig.upstart
|
|
|
Source3: 10-libvnc.conf
|
|
|
Source6: vncviewer.desktop
|
|
|
+Source11: xvnc.service
|
|
|
+Source12: xvnc.socket
|
|
|
|
|
|
#[ad-hoc] xorg-x11-server-source: has no hw/xfree86/Xorg.sh.in
|
|
|
Source1000: Xorg.sh.in
|
|
|
|
|
|
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
+Patch1: tigervnc-manpages.patch
|
|
|
+Patch2: tigervnc-getmaster.patch
|
|
|
+Patch3: tigervnc-shebang.patch
|
|
|
+Patch4: tigervnc-xstartup.patch
|
|
|
+Patch5: tigervnc-utilize-system-crypto-policies.patch
|
|
|
+Patch7: tigervnc-passwd-crash-with-malloc-checks.patch
|
|
|
|
|
|
-Provides: vnc = 4.1.3, vnc-libs = 4.1.3, vnc-server = 4.1.3
|
|
|
-Obsoletes: vnc < 4.1.3, vnc-libs < 4.1.3, vnc-server < 4.1.3
|
|
|
+Patch1000: xorg-server-1.20.7-ddxInputThreadInit.patch
|
|
|
+
|
|
|
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
BuildRequires: libX11-devel, automake, autoconf, libtool, gettext
|
|
|
BuildRequires: libXext-devel, xorg-x11-server-source, libXi-devel
|
|
@@ -41,18 +49,17 @@ BuildRequires: fltk-devel >= 1.3.3
|
|
|
|
|
|
Requires(post): coreutils
|
|
|
Requires(postun):coreutils
|
|
|
+%if %{with systemd}
|
|
|
+%{?systemd_requires}
|
|
|
+%else
|
|
|
+Requires(post): chkconfig, /sbin/service
|
|
|
+Requires(preun): chkconfig, /sbin/service
|
|
|
+Requires(postun): /sbin/service
|
|
|
+%endif
|
|
|
|
|
|
Requires: hicolor-icon-theme
|
|
|
-
|
|
|
-Patch1: tigervnc-manpages.patch
|
|
|
-Patch2: tigervnc-getmaster.patch
|
|
|
-Patch3: tigervnc-shebang.patch
|
|
|
-Patch4: tigervnc-xstartup.patch
|
|
|
-Patch5: tigervnc-utilize-system-crypto-policies.patch
|
|
|
-Patch7: tigervnc-passwd-crash-with-malloc-checks.patch
|
|
|
-
|
|
|
-#Patch100: tigervnc-xserver120.patch
|
|
|
-
|
|
|
+Provides: vnc = 4.1.3, vnc-libs = 4.1.3, vnc-server = 4.1.3
|
|
|
+Obsoletes: vnc < 4.1.3, vnc-libs < 4.1.3, vnc-server < 4.1.3
|
|
|
|
|
|
%description
|
|
|
Virtual Network Computing (VNC) is a remote display system which
|
|
@@ -62,9 +69,10 @@ from a wide variety of machine architectures.
|
|
|
This package contains a client which will allow you to connect to
|
|
|
other desktops running a VNC server.
|
|
|
|
|
|
+
|
|
|
%package server
|
|
|
Summary: A TigerVNC server
|
|
|
-Group: User Interface/X
|
|
|
+Group: servers
|
|
|
Provides: vnc = 4.1.3, vnc-libs = 4.1.3, vnc-server = 4.1.3
|
|
|
Obsoletes: vnc < 4.1.3, vnc-libs < 4.1.3, vnc-server < 4.1.3
|
|
|
Requires: perl
|
|
@@ -84,6 +92,9 @@ This package includes the following components:
|
|
|
- x0vncserver program: It can export your active X session
|
|
|
|
|
|
|
|
|
+%debug_package
|
|
|
+
|
|
|
+
|
|
|
%prep
|
|
|
%setup -q
|
|
|
|
|
@@ -93,8 +104,7 @@ pushd unix/xserver
|
|
|
for all in `find . -type f -perm -001`; do
|
|
|
chmod -x "$all"
|
|
|
done
|
|
|
-#patch100 -p1 -b .xserver116-rebased
|
|
|
-patch -p1 < ../xserver119.patch
|
|
|
+patch -p1 < ../xserver120.patch
|
|
|
popd
|
|
|
|
|
|
# Synchronise manpages and --help output (bug #980870).
|
|
@@ -110,14 +120,18 @@ popd
|
|
|
%patch4 -p1 -b .xstartup
|
|
|
|
|
|
# Utilize system-wide crypto policies
|
|
|
-%patch5 -p1 -b .utilize-system-crypto-policies
|
|
|
+#patch5 -p1 -b .utilize-system-crypto-policies
|
|
|
|
|
|
%patch7 -p1 -b .tigervnc-passwd-crash-with-malloc-checks
|
|
|
|
|
|
+%patch1000 -p1
|
|
|
+
|
|
|
+
|
|
|
%build
|
|
|
#export CFLAGS="$RPM_OPT_FLAGS -fpic"
|
|
|
+export CFLAGS="$RPM_OPT_FLAGS -fpic -I%{_includedir}/libdrm"
|
|
|
+
|
|
|
#export CXXFLAGS="$CFLAGS"
|
|
|
-export CFLAGS="$RPM_OPT_FLAGS -fpic"
|
|
|
export CXXFLAGS="$CFLAGS -std=c++11"
|
|
|
|
|
|
%{cmake} .
|
|
@@ -160,11 +174,21 @@ pushd unix/xserver/hw/vnc
|
|
|
make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
popd
|
|
|
|
|
|
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
|
|
+install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vncservers
|
|
|
+
|
|
|
+
|
|
|
+%if %{with systemd}
|
|
|
+mkdir -p %{buildroot}%{_unitdir}
|
|
|
+#make -C unix/vncserver install DESTDIR=%{buildroot}
|
|
|
+# Install systemd unit file
|
|
|
+install -m644 %{SOURCE11} %{buildroot}%{_unitdir}/xvnc@.service
|
|
|
+install -m644 %{SOURCE12} %{buildroot}%{_unitdir}/xvnc.socket
|
|
|
+%else
|
|
|
# Install init stuff
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
|
|
install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/vncserver
|
|
|
-install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vncservers
|
|
|
+%endif
|
|
|
|
|
|
# Install desktop stuff
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,24x24,48x48}/apps
|
|
@@ -188,9 +212,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libvnc.la
|
|
|
mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
|
|
|
install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/10-libvnc.conf
|
|
|
|
|
|
+
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
+
|
|
|
%post
|
|
|
touch -c %{_datadir}/icons/hicolor
|
|
|
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
|
|
@@ -204,12 +230,37 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
|
|
|
fi
|
|
|
|
|
|
%post server
|
|
|
+%if %{with systemd}
|
|
|
+%systemd_post xvnc.service
|
|
|
+%systemd_post xvnc.socket
|
|
|
+%else
|
|
|
/sbin/chkconfig --add vncserver
|
|
|
+%endif
|
|
|
+
|
|
|
+%preun server
|
|
|
+%if %{with systemd}
|
|
|
+%systemd_preun xvnc.service
|
|
|
+%systemd_preun xvnc.socket
|
|
|
+%else
|
|
|
+if [ "$1" = 0 -o -x /bin/systemctl ]; then
|
|
|
+ /sbin/service vncserver stop 2>&1 ||:
|
|
|
+ /sbin/chkconfig --del vncserver 2>&1 ||:
|
|
|
+fi
|
|
|
+%endif
|
|
|
+
|
|
|
+%postun server
|
|
|
+%if %{with systemd}
|
|
|
+%systemd_postun xvnc.service
|
|
|
+%systemd_postun xvnc.socket
|
|
|
+%else
|
|
|
+ /sbin/service vncserver condrestart 2>&1 ||:
|
|
|
+%endif
|
|
|
|
|
|
%triggerun -- vnc-server < 4.1.3
|
|
|
/sbin/service vncserver stop &>/dev/null || :
|
|
|
/sbin/chkconfig --del vncserver >/dev/null 2>&1 || :
|
|
|
|
|
|
+
|
|
|
%files -f %{name}.lang
|
|
|
%defattr(-,root,root,-)
|
|
|
%license LICENCE.TXT
|
|
@@ -222,7 +273,6 @@ fi
|
|
|
%files server
|
|
|
%defattr(-,root,root,-)
|
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/vncservers
|
|
|
-%config(noreplace) %{_sysconfdir}/init.d/vncserver
|
|
|
%{_bindir}/x0vncserver
|
|
|
%{_bindir}/vncserver
|
|
|
%{_bindir}/vncconfig
|
|
@@ -235,9 +285,19 @@ fi
|
|
|
%{_mandir}/man1/vncconfig.1*
|
|
|
%{_libdir}/xorg/modules/extensions/libvnc.so
|
|
|
%config %{_sysconfdir}/X11/xorg.conf.d/10-libvnc.conf
|
|
|
-
|
|
|
+%if %{with systemd}
|
|
|
+#%{_unitdir}/vncserver@.service
|
|
|
+%{_unitdir}/xvnc@.service
|
|
|
+%{_unitdir}/xvnc.socket
|
|
|
+%else
|
|
|
+%config(noreplace) %{_sysconfdir}/init.d/vncserver
|
|
|
+%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.1-2
|
|
|
+- rebuilt with nettle-3.6.
|
|
|
+- added systemd support (disabled as default).
|
|
|
+
|
|
|
* Mon Mar 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.1-1
|
|
|
- new upstream release.
|
|
|
- replaced all patches.
|