pool/tigervnc
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 1240537 from X11:XOrg

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1240537
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tigervnc?expand=0&rev=109
This commit is contained in:
Ana Guerrero 2025-01-27 19:50:30 +00:00 committed by Git OBS Bridge
commit 669f5f76fc
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tigervnc.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Mon Jan 27 10:33:08 UTC 2025 - Fabian Vogt <fvogt@suse.com>
- Remove wrong %selinux_requires from the main package, it's already
in the -selinux subpackage
-------------------------------------------------------------------
Fri Jan 24 15:39:03 UTC 2025 - Joan Torres <joan.torres@suse.com>
- Fix and clarify suse_version macros.
* %suse_version only defines major versions, e.g. 1500, 1600...
using %suse_version < 1550 might look like for version 15.4
is true but it isn't.
* Use %sle_version when targeting minor releases.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 21 13:08:53 UTC 2025 - Joan Torres <joan.torres@suse.com> Tue Jan 21 13:08:53 UTC 2025 - Joan Torres <joan.torres@suse.com>

11
tigervnc.spec
View File

@ -29,10 +29,10 @@
%endif %endif
%define use_update_alternative 0%{?suse_version} >= 1315 && 0%{?suse_version} < 1600 %define use_update_alternative 0%{?suse_version} >= 1315 && 0%{?suse_version} < 1600
%define with_rc_service_symlink 0%{?suse_version} && 0%{?suse_version} < 1600 %define with_rc_service_symlink 0%{?suse_version} && 0%{?suse_version} < 1600
%if 0%{?suse_version} < 1550 %if 0%{?suse_version} < 1600
%define _pam_vendordir %{_sysconfdir}/pam.d %define _pam_vendordir %{_sysconfdir}/pam.d
%endif %endif
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1600 || 0%{?sle_version} >= 150500
%bcond_without selinux %bcond_without selinux
%else %else
%bcond_with selinux %bcond_with selinux
@ -151,7 +151,6 @@ Requires(postun): update-alternatives
%if %{with selinux} %if %{with selinux}
BuildRequires: selinux-policy-%{selinuxtype} BuildRequires: selinux-policy-%{selinuxtype}
BuildRequires: selinux-policy-devel BuildRequires: selinux-policy-devel
%{selinux_requires}
%endif %endif
%description %description
@ -365,7 +364,7 @@ install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.
cp %{SOURCE4} . cp %{SOURCE4} .
install -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/vncpasswd.arg install -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/vncpasswd.arg
install -D -m 644 %{SOURCE6} %{buildroot}%{_pam_vendordir}/vnc install -D -m 644 %{SOURCE6} %{buildroot}%{_pam_vendordir}/vnc
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1600
mv %{buildroot}%{_sysconfdir}/pam.d/tigervnc %{buildroot}%{_pam_vendordir} mv %{buildroot}%{_sysconfdir}/pam.d/tigervnc %{buildroot}%{_pam_vendordir}
%endif %endif
install -D -m 644 %{SOURCE8} %{buildroot}%{_datadir}/vnc/classes install -D -m 644 %{SOURCE8} %{buildroot}%{_datadir}/vnc/classes
@ -416,7 +415,7 @@ fi
%pre -n xorg-x11-Xvnc -f xorg-x11-Xvnc.pre %pre -n xorg-x11-Xvnc -f xorg-x11-Xvnc.pre
%service_add_pre xvnc.socket xvnc.target %service_add_pre xvnc.socket xvnc.target
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1600
# Prepare for migration to /usr/lib; save any old .rpmsave # Prepare for migration to /usr/lib; save any old .rpmsave
for i in pam.d/vnc pam.d/tigervnc ; do for i in pam.d/vnc pam.d/tigervnc ; do
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||: test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
@ -570,7 +569,7 @@ fi
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd
%endif %endif
%if 0%{?suse_version} < 1550 %if 0%{?suse_version} < 1600
%config %{_sysconfdir}/pam.d/vnc %config %{_sysconfdir}/pam.d/vnc
%config(noreplace) %{_sysconfdir}/pam.d/tigervnc %config(noreplace) %{_sysconfdir}/pam.d/tigervnc
%else %else