upstream new tarball

OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=21

psmake-time.diff

@@ -1,22 +0,0 @@
-Fix a build error when psmake is bootstrapped via MAKE-sh:
-
-+ gcc -o smake make.o readfile.o parse.o update.o rules.o archconf.o job.o memory.o astoi.o astoll.o comerr.o error.o eaccess.o format.o getexecpath.o jsprintf.o jssnprintf.o saveargs.o seterrno.o strcatl.o strlcpy.o strncpy.o streql.o getargs.o geterrno.o movebytes.o fillbytes.o raisecond.o rename.o searchinpath.o uname.o file_raise.o fileopen.o fcons.o cvmod.o flag.o flush.o dat.o filewrite.o fileread.o fileseek.o niread.o niwrite.o
-[   85s] make.o: In function `gcurtime':
-[   85s] make.c:(.text+0x100f): undefined reference to `getnstimeofday'
-[   85s] collect2: error: ld returned 1 exit status
-
----
- psmake/MAKE-sh |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: schily-2018-05-17/psmake/MAKE-sh
-===================================================================
---- schily-2018-05-17.orig/psmake/MAKE-sh
-+++ schily-2018-05-17/psmake/MAKE-sh
-@@ -259,4 +259,5 @@ $CC $OPT $CF $CFLAGS -c $INCLUDE $DEFINE
- $CC $OPT $CF $CFLAGS -c $INCLUDE $DEFINES   fileseek.c
- $CC $OPT $CF $CFLAGS -c $INCLUDE $DEFINES   niread.c
- $CC $OPT $CF $CFLAGS -c $INCLUDE $DEFINES   niwrite.c
--$CC $LF $LDFLAGS -o smake make.$o readfile.$o parse.$o update.$o rules.$o archconf.$o job.$o memory.$o  astoi.$o astoll.$o comerr.$o error.$o eaccess.$o format.$o getexecpath.$o jsprintf.$o jssnprintf.$o saveargs.$o seterrno.$o strcatl.$o strlcpy.$o strncpy.$o streql.$o getargs.$o geterrno.$o movebytes.$o fillbytes.$o raisecond.$o rename.$o searchinpath.$o uname.$o file_raise.$o fileopen.$o fcons.$o cvmod.$o flag.$o flush.$o dat.$o filewrite.$o fileread.$o fileseek.$o niread.$o niwrite.$o
-+$CC $OPT $CF $CFLAGS -c $INCLUDE $DEFINES   ../libschily/getnstimeofday.c
-+$CC $LF $LDFLAGS -o smake make.$o readfile.$o parse.$o update.$o rules.$o archconf.$o job.$o memory.$o  astoi.$o astoll.$o comerr.$o error.$o eaccess.$o format.$o getexecpath.$o jsprintf.$o jssnprintf.$o saveargs.$o seterrno.$o strcatl.$o strlcpy.$o strncpy.$o streql.$o getargs.$o geterrno.$o movebytes.$o fillbytes.$o raisecond.$o rename.$o searchinpath.$o uname.$o file_raise.$o fileopen.$o fcons.$o cvmod.$o flag.$o flush.$o dat.$o filewrite.$o fileread.$o fileseek.$o niread.$o niwrite.$o getnstimeofday.$o

schily-2018-05-17.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e3bebf2cf1b5dce385496bf5140edb4450cf086c9bfb4cff6f832a7bd0e94a3
+oid sha256:08d9fa3c83417aaceb227d57fbcb8cb9bc1202f382072d9ca4c348d44be9a60f
-size 4225066
+size 4225794

schily.changes

@@ -17,7 +17,6 @@ Thu May 17 14:06:18 UTC 2018 - jengelh@inai.de
   * star: Added a new archive format "epax". This is the same as
     "pax", but it always includes a POSIX.1-2001 extended header
     with timestamps with nanosecond resolution.
-- Add psmake-time.diff
 
 -------------------------------------------------------------------
 Wed May 16 22:12:34 UTC 2018 - jengelh@inai.de

schily.spec

@@ -35,7 +35,6 @@ Source:         https://downloads.sf.net/schilytools/%name-%rver.tar.bz2
 Patch1:         gcc48wa.diff
 Patch2:         iconv-name.diff
 Patch3:         gccwarns.diff
-Patch4:         psmake-time.diff
 # Honor https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Upstream_policy
 # and submit patches upstream FIRST (cc to the bspkg maintainer perhaps).
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -403,7 +402,7 @@ Features:
 
 %prep
 %setup -qn %name-%rver
-%patch -P 1 -P 2 -P 3 -P 4 -p1
+%patch -P 1 -P 2 -P 3 -p1
 find . "(" -type d -o -type f ")" -exec chmod u+w "{}" "+"
 
 %build
@@ -417,20 +416,16 @@ rm -fv libshedit/shlshedit.mk
 # Static link libsiconv. It forwards to glibc iconv for supported charsets.
 rm -fv libsiconv/shlsiconv.mk
 
-#pushd psmake/
+find . -type f -exec touch {} +
-#CFLAGS="%optflags" sh MAKE-sh
-#popd
 
-# (this is a noninteractive build; nobody will read the warnings
+# - To enable verbosity, use with CC=cc LDCC=cc DYNLD=cc.
-# or care about the pause, so use GMAKE_NOWARN.)
+# - Not fully parallel safe, so stick to default.
-#
-# To enable verbosity, use with CC=cc LDCC=cc DYNLD=cc.
-#
-# Not fully parallel safe, so stick to default.
 #
 mycf="%optflags -fno-strict-aliasing -fno-omit-frame-pointer -fPIC -finput-charset=ISO-8859-1"
 gmake RUNPATH="" LINKMODE=dynamic COPTOPT="$mycf" LDOPTX=""
 rm -fv cdrecord/OBJ/*/cdrecord cdda2wav/OBJ/*/cdda2wav readcd/OBJ/*/readcd
+# At this point, only the three programs should be relinked.
+# But on Leap 42.3, a bunch of .c files get rebuilt if we don't touch (see above).
 gmake RUNPATH="" LINKMODE=dynamic COPTOPT="$mycf -fPIE" LDOPTX=-pie
 
 %install
@@ -438,6 +433,9 @@ b="%buildroot"
 # D'oh… not parallel safe
 gmake GMAKE_NOWARN=true RUNPATH="" LINKMODE=dynamic \
 	DESTDIR="$b" INS_BASE="%_prefix" install -j1
+# Fix permissions again.
+find "$b" "(" -type d -o -type f ")" -exec chmod u+w "{}" "+"
+
 if test "%_lib" != lib; then
 	mkdir -p "$b/%_libdir"
 	mv "$b/%_prefix/lib"/* "$b/%_libdir/"