commit ncompress for openSUSE:Factory
Hello community, here is the log from the commit of package ncompress for openSUSE:Factory checked in at 2017-07-28 09:42:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncompress (Old) and /work/SRC/openSUSE:Factory/.ncompress.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ncompress" Fri Jul 28 09:42:13 2017 rev:4 rq:512225 version:4.2.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ncompress/ncompress.changes 2017-05-31 12:19:00.782576203 +0200 +++ /work/SRC/openSUSE:Factory/.ncompress.new/ncompress.changes 2017-07-28 09:42:15.321792182 +0200 @@ -1,0 +2,7 @@ +Sun Jul 23 20:27:48 UTC 2017 - bwiedemann@suse.com + +- Add ncompress-4.2.4.4-drop-datestamp.patch to drop compile date + to fix build-compare (boo#1047218) +- Use make Makefile to avoid build time race + +------------------------------------------------------------------- New: ---- ncompress-4.2.4.4-drop-datestamp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncompress.spec ++++++ --- /var/tmp/diff_new_pack.WG6Z6Z/_old 2017-07-28 09:42:16.017694171 +0200 +++ /var/tmp/diff_new_pack.WG6Z6Z/_new 2017-07-28 09:42:16.017694171 +0200 @@ -29,6 +29,8 @@ Patch2: %{name}-4.2.4.4-filenamelen.patch Patch3: %{name}-2GB.patch Patch6: %{name}-4.2.4-endians.patch +# PATCH-FIX-UPSTREAM -- drop date to fix build-compare (boo#1047218) +Patch7: ncompress-4.2.4.4-drop-datestamp.patch # gzip provides the uncompress tool in /usr/bin # we don't provide a link here as this conflicts with gzip Requires: gzip @@ -51,6 +53,7 @@ %patch2 -p1 -b .filenamelen %patch3 -p1 -b .2GB %patch6 -p1 -b .endians +%patch7 -p1 %build export RPM_OPT_FLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" @@ -59,6 +62,7 @@ %else export ENDIAN=4321 %endif +make Makefile # avoid build time race make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ENDIAN="$ENDIAN" %install ++++++ ncompress-4.2.4.4-drop-datestamp.patch ++++++ commit d2e2d00094019028e553bfdd7f0bb18eefd1d5fe Author: Mike Frysinger <vapier@gmail.com> Date: Sat Aug 8 01:33:28 2015 -0400 drop use of datestamp in compiled output This doesn't add that much (if any) value to the version output, and it prevents systems from caching the results or reproducing it later on. Drop it all. Fixes #3. Index: ncompress-4.2.4.4/Makefile.def =================================================================== --- ncompress-4.2.4.4.orig/Makefile.def +++ ncompress-4.2.4.4/Makefile.def @@ -38,7 +38,7 @@ LBOPT= $(LDFLAGS) compress: Makefile compress42.c patchlevel.h - $(CC) -o compress $(options) "-DCOMPILE_DATE=\"`date`\"" compress42.c $(LBOPT) + $(CC) -o compress $(options) compress42.c $(LBOPT) install: compress [ -f $(DESTDIR)$(BINDIR)/compress ] && \ Index: ncompress-4.2.4.4/build =================================================================== --- ncompress-4.2.4.4.orig/build +++ ncompress-4.2.4.4/build @@ -566,9 +566,9 @@ do echo "" echo "Compiling compress ${version}" - echo ${CC} ${options} "-DCOMPILE_DATE=\"`date`\"" compress42.c ${LBOPT} + echo ${CC} ${options} compress42.c ${LBOPT} - if ${CC} ${options} "-DCOMPILE_DATE=\"`date`\"" compress42.c ${LBOPT} + if ${CC} ${options} compress42.c ${LBOPT} then echo "" ./compress -V @@ -599,9 +599,9 @@ do echo "" echo "Compiling compress ${version}" - echo ${CC} ${options} "-DCOMPILE_DATE=\"`date`\"" compress42.c + echo ${CC} ${options} compress42.c - ${CC} ${options} "-DCOMPILE_DATE=\"`date`\"" compress42.c + ${CC} ${options} compress42.c echo "" echo ${n} "Press return to continue${c}" read dummy @@ -790,7 +790,7 @@ LBOPT=${LBOPT} compress: Makefile compress42.c patchlevel.h - $(CC) -o compress $(options) "-DCOMPILE_DATE=\"\`date\`\"" compress42.c $(LBOPT) + $(CC) -o compress $(options) compress42.c $(LBOPT) install: compress [ -f \$(BINDIR)/compress ] && \\ Index: ncompress-4.2.4.4/compress42.c =================================================================== --- ncompress-4.2.4.4.orig/compress42.c +++ ncompress-4.2.4.4/compress42.c @@ -261,7 +261,6 @@ # define BYTEORDER 4321 # undef NOALLIGN # define NOALLIGN 1 -# define COMPILE_DATE __DATE__ #endif /* DOS */ #ifndef O_BINARY @@ -1865,7 +1864,7 @@ prratio(stream, num, den) void about() { - fprintf(stderr, "Compress version: %s, compiled: %s\n", version_id, COMPILE_DATE); + fprintf(stderr, "Compress version: %s\n", version_id); fprintf(stderr, "Compile options:\n "); #if BYTEORDER == 4321 && NOALLIGN == 1 fprintf(stderr, "USE_BYTEORDER, ");
participants (1)
-
root@hilbert.suse.de