diff --git a/tigervnc.changes b/tigervnc.changes index 83456f9..a3edbd9 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 24 15:39:03 UTC 2025 - Joan Torres + +- 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 diff --git a/tigervnc.spec b/tigervnc.spec index 641e4e9..f888064 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -29,10 +29,10 @@ %endif %define use_update_alternative 0%{?suse_version} >= 1315 && 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 %endif -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1600 || 0%{?sle_version} >= 150500 %bcond_without selinux %else %bcond_with selinux @@ -365,7 +365,7 @@ install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2. cp %{SOURCE4} . install -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/vncpasswd.arg 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} %endif install -D -m 644 %{SOURCE8} %{buildroot}%{_datadir}/vnc/classes @@ -416,7 +416,7 @@ fi %pre -n xorg-x11-Xvnc -f xorg-x11-Xvnc.pre %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 for i in pam.d/vnc pam.d/tigervnc ; do test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||: @@ -570,7 +570,7 @@ fi %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd %endif -%if 0%{?suse_version} < 1550 +%if 0%{?suse_version} < 1600 %config %{_sysconfdir}/pam.d/vnc %config(noreplace) %{_sysconfdir}/pam.d/tigervnc %else