Accepting request 1056976 from shells

Replace transitional %usrmerged macro with regular version check (boo#1206798) (forwarded request 1055745 from lnussel)

OBS-URL: https://build.opensuse.org/request/show/1056976
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tcsh?expand=0&rev=89

tcsh-6.24.06.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a8cd0cd1ddc94f870681ccbd09a3511050e9a71e5fe99a2b007941f5e1b2b7a5
-size 946421

tcsh-6.24.06.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEErYcQl2PY2MLJTLqAZcJuRx9FsSMFAmOXT4UACgkQZcJuRx9F
-sSOM9RAAmKC/CL7RySDfuzYAJTYRZL9KJblRhA37W7wPBxOYmJ/y3UpKilmequxx
-MjZXYzThICIfR9JqgeHxoOUl3ShwhQQxDmROHDzgDTvGhftXbwNu4tnF0REGKz+l
-3t/Hv8K94f1Pgw5FR4J4tzofoDEbtf0IjlnLw/diaNbNYALN3igxyhi7bDfWDp5O
-cen9sj7PBIKriRjLvqB05641A7P3RjJ/rvCzwAS+fhDkidGcOkHnqCKCTYRVtrZX
-Ez4I+6zdMO0TQXbWJnGIxPA5uDZuN6mmZvpJCv7DksvqpGK1asTCOTrPtpLKrt4U
-r6w/xjcAmd6VgBM2MjO2s5deL9TmGmICVR3Pleg/5ZpLApbfRVlwGtw4qkDBHxPI
-AbnwXGMS1G24VkY3QzqcUm4eCf1wntasBQNO2vwb25AmEwbKHPzRfZf7wHZcqGD7
-UuN5yacRlRIIHfCIuWalewaeo69gzGUt2e6WSvtL7AzzBmLy8h039Kd1vMKRqvx3
-PTmCFh/lC2te8DWoZC019+4ZkXLN7nPrLd02QePqZdGkREvfo7muDaPHalnbIDwW
-MlvQrbJmgvj0Uj0stY8P9Ob5Q3vOFBVje/hHbbfslw3XwZpa1D4dVDNXkPS6hnnF
-vi9OoiyXHHN+af0lPN6Bire4KXgxho/glySjrVuNGhJ/lv0xqX0=
-=OQim
------END PGP SIGNATURE-----

tcsh-6.24.07.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74e4e9805cbd9413ed34b4ffa1d72fc8d0ef81a5b79476854091416ce9336995
+size 946889

tcsh-6.24.07.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEErYcQl2PY2MLJTLqAZcJuRx9FsSMFAmOjYmYACgkQZcJuRx9F
+sSPENQ/9ERRyohkmePIjVt/iaztIJtdtVOXuzRFrEoSohC8iOPSprVl6qjJt5sFh
+1e92eelR/Uf1x/KL2dwUHrT7HwMIcu5GXBleSFkHoMkOIo/zzjMA6eDc6IzI+iwQ
+t7dPNTSq71EOKhQElzLc31reha6r/XODKXkR2i7y8RjdvzfiyrWPs3pWsHrVcorB
+/d8cfx2cRCCs7MC+RpUWKjAjwhrwuPTh0ZbUt0NdcYL4CowS/r99L7IlGZBafRt6
+kMrCjnZPmAiObI3saQQX/cj2L+90/2eGhMD/neN4iTPdo/ibJ8wv9sWm4WUQSjZ2
+QpZtF+HOPiQpk7kQg2X0hF/VE6/0yXqU3wNuOtoHYOuDvXD6fqhD5Bqqx4nL/o6S
+mSycn8k+mQMKo38x8tS5yqeGonQXkSb56YRIc3TPMyBFPxaWDmnQLq0+E//r23m9
+xKX6akw2zCasVnv3+GYzCxbE9d7N9tjPIWYhuBum6Tm4m6sDZIjXJO/NuuhWy2lD
+MZ7Agc5LJeGUj/jMrSixar8//wIW+veWy1ZRFLYZ84HtmnxIfdPSgRpXTjGzKS7y
+vRiLI7ygPxYtsUmuzwOwKDYqDqaSfnN91p4wP7Vcg135S7R/3e7E+D5zzLQx+rzD
+2YB0LOi/+JQAgXUFiBgC/eaPlZF6OUmd8E30AXC3sSAVHXZcDq4=
+=9Q/z
+-----END PGP SIGNATURE-----

tcsh.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Dec 28 09:52:59 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update to 6.24.07:
+  * widen the pid field in pprint so that it aligns even with large pids
+  * 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

@@ -17,14 +17,14 @@
 
 
 Name:           tcsh
-Version:        6.24.06
+Version:        6.24.07
 Release:        0
 Summary:        The C SHell
 License:        BSD-3-Clause
 Group:          System/Shells
-URL:            http://www.tcsh.org/
+URL:            https://www.tcsh.org/
-Source0:        ftp.astron.com:/pub/%{name}/%{name}-%{version}.tar.gz
+Source0:        https://astron.com/pub/%{name}/%{name}-%{version}.tar.gz
-Source1:        ftp.astron.com:/pub/%{name}/%{name}-%{version}.tar.gz.asc
+Source1:        https://astron.com/pub/%{name}/%{name}-%{version}.tar.gz.asc
 Source2:        bindkey.tcsh
 Source3:        complete.tcsh
 Source4:        tcsh.keyring
@@ -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