Accepting request 1055745 from home:lnussel:usrmerge

Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1055745
OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=145

tcsh.changes

@@ -6,6 +6,11 @@ Wed Dec 28 09:52:59 UTC 2022 - Dirk Müller <dmueller@suse.com>
   * build system updates 
 - use https for download urls
 
+-------------------------------------------------------------------
+Tue Dec 27 13:22:37 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Tue Dec 13 07:25:34 UTC 2022 - Dr. Werner Fink <werner@suse.de>
 

tcsh.spec

@@ -183,7 +183,7 @@ correction, a history mechanism, job control, and a C-like syntax.
     rm -rf %{buildroot}%{_datadir}/locale/C
     ln -sf tcsh           %{buildroot}/%{_bindir}/csh
     ln -sf tcsh.1.gz      %{buildroot}%{_mandir}/man1/csh.1.gz
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
     mkdir -p %{buildroot}/bin
     ln -s %{_bindir}/tcsh %{buildroot}/bin/tcsh
     ln -s %{_bindir}/tcsh %{buildroot}/bin/csh
@@ -192,7 +192,7 @@ correction, a history mechanism, job control, and a C-like syntax.
 %files
 %defattr(-,root,root)
 %dir %{_docdir}/tcsh
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /bin/csh
 /bin/tcsh
 %endif