diff options
| author | Mark Mielke <mark.mielke@gmail.com> | 2020-07-27 23:28:35 -0400 |
|---|---|---|
| committer | Mark Mielke <mark.mielke@gmail.com> | 2020-07-27 23:28:35 -0400 |
| commit | ecf1402221b536f29a17fe034b5987eb7322b110 (patch) | |
| tree | 133985854d22a842dc3f492d45a935a49e70060e /contrib/packages/rpm | |
| parent | 0102acc61e40cb5dd6f0dfa4466bf628e7924da6 (diff) | |
| download | tigervnc-ecf1402221b536f29a17fe034b5987eb7322b110.tar.gz tigervnc-ecf1402221b536f29a17fe034b5987eb7322b110.zip | |
EL 7 tigervnc.spec updates
Add missing build requirements: libpng-devel, zlib-devel
Remove obsolete build requirements: libXfont-devel
Fix unexpected rpm macro expansion `%{VERSION}` which is supposed
to be passed through as literal to `rpm -q --qf`. This hasn't
caused problems before, but it was found to cause problems when
built from EL 8 when it expanded to "1.10.1".
Diffstat (limited to 'contrib/packages/rpm')
| -rw-r--r-- | contrib/packages/rpm/el7/SPECS/tigervnc.spec | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/contrib/packages/rpm/el7/SPECS/tigervnc.spec b/contrib/packages/rpm/el7/SPECS/tigervnc.spec index 21d5bb5f..fa850a2d 100644 --- a/contrib/packages/rpm/el7/SPECS/tigervnc.spec +++ b/contrib/packages/rpm/el7/SPECS/tigervnc.spec @@ -1,6 +1,6 @@ Name: tigervnc Version: @VERSION@ -Release: 5%{?snap:.%{snap}}%{?dist} +Release: 1%{?snap:.%{snap}}%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops @@ -15,13 +15,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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: libdrm-devel, libXt-devel, pixman-devel libXfont-devel +BuildRequires: libdrm-devel, libXt-devel, pixman-devel BuildRequires: libxkbfile-devel, openssl-devel, libpciaccess-devel BuildRequires: mesa-libGL-devel, libXinerama-devel, ImageMagick BuildRequires: freetype-devel, libXdmcp-devel, libXfont2-devel BuildRequires: libXrandr-devel, fltk-devel >= 1.3.3 BuildRequires: libjpeg-turbo-devel, gnutls-devel, pam-devel BuildRequires: systemd, cmake, selinux-policy-devel +BuildRequires: libpng-devel +BuildRequires: zlib-devel Requires(post): coreutils Requires(postun): coreutils @@ -137,7 +139,7 @@ pushd unix/xserver for all in `find . -type f -perm -001`; do chmod -x "$all" done -xserver_patch="../xserver$(rpm -q --qf '%{VERSION}' xorg-x11-server-source | awk -F. '{ print $1 $2 }').patch" +xserver_patch="../xserver$(rpm -q --qf '%%{VERSION}' xorg-x11-server-source | awk -F. '{ print $1 $2 }').patch" patch -p1 -b --suffix .vnc < "$xserver_patch" popd @@ -297,6 +299,9 @@ fi %{_datadir}/selinux/packages/vncsession.pp %changelog +* Mon Jul 27 2020 Mark Mielke <mmielke@ciena.com> 1.10.1-1 +- Update build requirements and fix unexpected rpm macro expansion. + * Mon Feb 11 2019 Mark Mielke <mmielke@ciena.com> 1.9.80-5 - Automatically detect and apply the correct X.org patch. |