Accepting request 685554 from utilities

- Add Conflict markers for file-based conflicts identified
  by repo-checker.
- Update to new upstream release 2019.03.11

OBS-URL: https://build.opensuse.org/request/show/685554
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/schily?expand=0&rev=10

schily-2019-02-18.tar.bz2

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

schily-2019-03-11.tar.bz2

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

schily.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Sat Mar 16 08:49:52 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Add Conflict markers for file-based conflicts identified
+  by repo-checker.
+
+-------------------------------------------------------------------
+Fri Mar 15 10:09:54 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to new upstream release 2019.03.11
+  * star: Support for base-256 numbers in timestamps and UID/GID
+    has been added. This has been planned in the 1990s already,
+    when star invented the base-256 coding, but it has been
+    forgotten in favor of the POSIX.1-2001 enhanded archive
+    headers. Now it seems that GNU tar that copied the format
+    from star uses it for timestamps and UID/GID and we need to
+    implement it in order to get archive compatibility.
+  * star: star did print archives with illegal 32 byte user/group
+    names (where the NUL terminator is missing) "correctly", when
+    in list mode but it used only the first 31 bytes when
+    extractig such archives.
+  * star: Creating multi volume archives without using the FIFO
+    did dump core.
+  * star: Creating multi volume archives without POSIX.1-2001
+    support no longer sets POSIX.1-2001 extension flags for the
+    volume header.
+
 -------------------------------------------------------------------
 Wed Feb 20 18:42:13 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 

schily.spec

@@ -17,23 +17,23 @@
 
 
 # grep -r define.VERSION (sometimes also noted down in schily-%rver/AN-%rver)
-%global box_version	2019.02.18
+%global box_version	2019.03.11
 %global cdr_version	3.02~a10
 %global sccs_version	5.09
 %global smake_version	1.3
 %global star_version	1.6
 %global libfind_version 1.7
 %global ved_version     1.7
-%define rver	2019-02-18
+%define rver	2019-03-11
 
 Name:           schily
-Version:        2019.02.18
+Version:        %box_version
 Release:        0
 Summary:        A collection of command-line utilities maintained by J.Schilling
 License:        CDDL-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND HPND AND ISC
 Group:          Productivity/Multimedia/CD/Record
-Url:            http://cdrtools.sourceforge.net/private/cdrecord.html
+URL:            http://cdrtools.sourceforge.net/private/cdrecord.html
-#Freshcode-Url:	http://freshcode.club/projects/schily
+#Freshcode-URL:	http://freshcode.club/projects/schily
 
 Source:         https://downloads.sf.net/schilytools/%name-%rver.tar.bz2
 Source1:        README-FIRST
@@ -59,6 +59,7 @@ The "Schily" Tool Box is a set of tools written or managed by Jörg Schilling.
 Summary:        Multibyte-capable POSIX-conforming Bourne shell
 License:        CDDL-1.0
 Group:          System/Shells
+Conflicts:      bsh
 
 %description -n bosh
 bosh is a Bourne-style POSIX command interpreter (shell), similar to dash,
@@ -71,9 +72,8 @@ Group:          Hardware/Other
 
 %description -n btcflash
 Btcflash is used to read update the Firmware for a BTC DRW1008
-DVD+/-RW recorder. Be very careful when writing firmware as this
+DVD±RW recorder. Be very careful when writing firmware as this
 program does not check for the correctness of the target device.
-Build from clean sources without patches.
 
 %package -n cdda2wav
 Summary:        A CD Digital Audio Extraction tool
@@ -376,6 +376,8 @@ connection, and through that, have the rmt program executed.
 Summary:        Source Code Control System
 License:        CDDL-1.0
 Group:          Development/Tools/Version Control
+Conflicts:      delta
+Conflicts:      ksh
 
 %description -n sccs
 Source Code Control System (SCCS) is a version control system for