diff --git a/SPECS/tigervnc.spec b/SPECS/tigervnc.spec index a096dbe..d78ce25 100644 --- a/SPECS/tigervnc.spec +++ b/SPECS/tigervnc.spec @@ -1,6 +1,6 @@ Name: tigervnc Version: 1.10.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A TigerVNC remote display system %global _hardened_build 1 @@ -52,9 +52,7 @@ BuildRequires: libXfont-devel # TigerVNC 1.4.x requires fltk 1.3.3 for keyboard handling support # See https://github.com/TigerVNC/tigervnc/issues/8, also bug #1208814 BuildRequires: fltk-devel >= 1.3.3 -%ifnarch s390 s390x BuildRequires: xorg-x11-server-devel -%endif Requires(post): coreutils Requires(postun):coreutils @@ -104,7 +102,6 @@ variety of platforms. This package contains minimal installation of TigerVNC server, allowing others to access the desktop on your machine. -%ifnarch s390 s390x %package server-module Summary: TigerVNC module to Xorg Requires: xorg-x11-server-Xorg %(xserver-sdk-abi-requires ansic) %(xserver-sdk-abi-requires videodrv) @@ -113,7 +110,6 @@ Requires: tigervnc-license %description server-module This package contains libvnc.so module to X server, allowing others to access the desktop on your machine. -%endif %package license Summary: License of TigerVNC suite @@ -272,12 +268,8 @@ chmod +x %{buildroot}/%{_bindir}/vncserver # remove unwanted files rm -f %{buildroot}%{_libdir}/xorg/modules/extensions/libvnc.la -%ifarch s390 s390x -rm -f %{buildroot}%{_libdir}/xorg/modules/extensions/libvnc.so -%else mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/ install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/10-libvnc.conf -%endif install -m 644 %{SOURCE4} %{buildroot}/%{_docdir}/tigervnc/HOWTO.md @@ -342,11 +334,9 @@ fi %{_mandir}/man1/vncpasswd.1* %{_mandir}/man1/vncconfig.1* -%ifnarch s390 s390x %files server-module %{_libdir}/xorg/modules/extensions/libvnc.so %config %{_sysconfdir}/X11/xorg.conf.d/10-libvnc.conf -%endif %files license %{_docdir}/tigervnc/LICENCE.TXT @@ -359,6 +349,10 @@ fi %changelog +* Wed Jul 08 2020 Jan Grulich - 1.10.1-7 +- Enable server module on s390x + Resolves: bz#1854925 + * Fri Jul 03 2020 Jan Grulich - 1.10.1-6 - Remove trailing spaces in user name Resolves: bz#1852432