diff --git a/tigervnc.spec b/tigervnc.spec index 616ec62422f6c9891024a15d1e1f88d11ac13e5f..418cc1acf1fe6d639f5b79312056e86af88d3446 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 5 #defining macros needed by SELinux %global selinuxtype targeted %global modulename vncsession @@ -35,17 +35,21 @@ Patch100: tigervnc-xserver120.patch BuildRequires: make BuildRequires: gcc-c++ -BuildRequires: libX11-devel, automake, autoconf, libtool, gettext, gettext-autopoint -BuildRequires: libXext-devel, xorg-x11-server-source, libXi-devel -BuildRequires: xorg-x11-xtrans-devel, xorg-x11-util-macros, libXtst-devel +BuildRequires: automake, autoconf, libtool, gettext, gettext-autopoint +BuildRequires: cmake, desktop-file-utils BuildRequires: libxkbfile-devel, openssl-devel, libpciaccess-devel -BuildRequires: mesa-libGL-devel, libXinerama-devel, xorg-x11-font-utils -BuildRequires: freetype-devel, libXdmcp-devel, libxshmfence-devel -BuildRequires: libjpeg-turbo-devel, gnutls-devel, pam-devel -BuildRequires: libdrm-devel, libXt-devel, pixman-devel, -BuildRequires: systemd, cmake, desktop-file-utils -BuildRequires: libselinux-devel, selinux-policy-devel +BuildRequires: freetype-devel, libjpeg-turbo-devel, gnutls-devel, pam-devel +# X11/graphics dependencies +BuildRequires: xorg-x11-server-source +BuildRequires: libXext-devel, libX11-devel, libXi-devel, libXfixes-devel +BuildRequires: libXdamage-devel, libXrandr-devel, libXt-devel, libXdmcp-devel +BuildRequires: libXinerama-devel, mesa-libGL-devel, libxshmfence-devel +BuildRequires: pixman-devel, libdrm-devel +BuildRequires: xorg-x11-util-macros, xorg-x11-xtrans-devel, libXtst-devel +BuildRequires: xorg-x11-font-utils BuildRequires: libXfont2-devel +# SELinux +BuildRequires: libselinux-devel, selinux-policy-devel, systemd # TigerVNC 1.4.x requires fltk 1.3.3 for keyboard handling support # See https://github.com/TigerVNC/tigervnc/issues/8, also bug #1208814 @@ -198,7 +202,7 @@ autoreconf -fiv --disable-devel-docs \ --disable-selective-werror -make %{?_smp_mflags} +%make_build popd # Build icons @@ -221,7 +225,7 @@ popd # Install systemd unit file pushd unix/vncserver/selinux -make install DESTDIR=%{buildroot} +%make_install popd # Install systemd unit file @@ -242,7 +246,6 @@ install -m 755 %{SOURCE5} %{buildroot}/%{_bindir}/vncserver %find_lang %{name} %{name}.lang # remove unwanted files -rm -f %{buildroot}%{_libdir}/xorg/modules/extensions/libvnc.la rm %{buildroot}%{_docdir}/%{name}/README.rst mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/ @@ -331,6 +334,9 @@ fi %ghost %verify(not md5 size mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename} %changelog +* Thu Dec 22 2022 Funda Wang - 1.12.0-5 +- Bump release for upgrading from anolis 8 + * Wed Nov 02 2022 mgb01105731 - 1.12.0-3 - optimise spec file