Re-enable server in flatpak builds and fix the build
This makes it possible to build Xvnc (tigervnc-server-minimal) for /app, so that other packages such as libdazzle can use it to run their self tests under Xvnc.
This commit is contained in:
parent
5c041555c6
commit
c760092ff6
@ -2,7 +2,7 @@
|
||||
%global selinuxtype targeted
|
||||
%global modulename vncsession
|
||||
|
||||
%bcond server %{undefined flatpak}
|
||||
%bcond server 1
|
||||
|
||||
Name: tigervnc
|
||||
Version: 1.13.1
|
||||
@ -210,7 +210,7 @@ export CXXFLAGS="$CFLAGS -std=c++11"
|
||||
mkdir -p %{%__cmake_builddir}
|
||||
%endif
|
||||
|
||||
%cmake
|
||||
%cmake -DCMAKE_INSTALL_UNITDIR=%{_unitdir}
|
||||
|
||||
%cmake_build
|
||||
|
||||
@ -226,7 +226,7 @@ autoreconf -fiv
|
||||
--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
|
||||
--disable-xwin --disable-xephyr --disable-kdrive --disable-xwayland \
|
||||
--with-pic --disable-static \
|
||||
--with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \
|
||||
--with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \
|
||||
--with-xkb-output=%{_localstatedir}/lib/xkb \
|
||||
--enable-glx --disable-dri --enable-dri2 --disable-dri3 \
|
||||
--disable-unit-tests \
|
||||
@ -267,9 +267,9 @@ pushd unix/xserver/hw/vnc
|
||||
%make_install
|
||||
popd
|
||||
|
||||
# Install systemd unit file
|
||||
# Install selinux policy file
|
||||
pushd unix/vncserver/selinux
|
||||
make install DESTDIR=%{buildroot}
|
||||
make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
|
||||
popd
|
||||
|
||||
# Install systemd unit file
|
||||
@ -382,6 +382,7 @@ fi
|
||||
* Wed Oct 18 2023 Kalev Lember <klember@redhat.com> - 1.13.1-5
|
||||
- Drop unrecognized configure options
|
||||
- Add buildrequires to get correct font and xkb directories from pkg-config
|
||||
- Re-enable server in flatpak builds and fix the build
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
Loading…
Reference in New Issue
Block a user