From 253848a08057b41297441072621bb53f3705c6727aef0aff84a690eef2cb3435 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 13 Aug 2009 21:29:34 +0000 Subject: [PATCH] Accepting request 17717 from devel:tools Copy from devel:tools/diffstat based on submit request 17717 from user pgajdos OBS-URL: https://build.opensuse.org/request/show/17717 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/diffstat?expand=0&rev=5 --- diffstat-1.47.tar.bz2 | 3 -- diffstat-1.47.diff => diffstat-1.48.diff | 13 +++++ diffstat-1.48.tar.bz2 | 3 ++ diffstat.changes | 13 +++++ diffstat.spec | 61 ++---------------------- 5 files changed, 32 insertions(+), 61 deletions(-) delete mode 100644 diffstat-1.47.tar.bz2 rename diffstat-1.47.diff => diffstat-1.48.diff (88%) create mode 100644 diffstat-1.48.tar.bz2 diff --git a/diffstat-1.47.tar.bz2 b/diffstat-1.47.tar.bz2 deleted file mode 100644 index dedf861..0000000 --- a/diffstat-1.47.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62c19eb98ad7f77672e25b84d400fd3374b6720622b75afcaff01b209abb7ec0 -size 93186 diff --git a/diffstat-1.47.diff b/diffstat-1.48.diff similarity index 88% rename from diffstat-1.47.diff rename to diffstat-1.48.diff index c1b1391..b26c145 100644 --- a/diffstat-1.47.diff +++ b/diffstat-1.48.diff @@ -12,6 +12,19 @@ +#define HAVE_STRING_H 0 +#define HAVE_UNISTD_H 0 +#define STDC_HEADERS 0 +--- diffstat.c ++++ diffstat.c +@@ -217,6 +217,10 @@ + #define BZIP2_PATH "" + #endif + ++#ifndef ZCAT_PATH ++#define ZCAT_PATH "" ++#endif ++ + #ifndef COMPRESS_PATH + #define COMPRESS_PATH "" + #endif --- makefile.in +++ makefile.in @@ -8,6 +8,7 @@ diff --git a/diffstat-1.48.tar.bz2 b/diffstat-1.48.tar.bz2 new file mode 100644 index 0000000..0e70f71 --- /dev/null +++ b/diffstat-1.48.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a51fb58e8f08c4fd184bf362b261f06a6fc3e9c42a5953e3c00b27440abb851 +size 175995 diff --git a/diffstat.changes b/diffstat.changes index a55ec46..cab0809 100644 --- a/diffstat.changes +++ b/diffstat.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Aug 13 16:42:39 CEST 2009 - pgajdos@suse.cz + +- updated to 1.48: + * add decompression tests for lzma and pack file types. + * check for zcat and uncompress in preference to "compress -dc". + * modify to check the first few bytes of standard input, and use a + corresponding decompression utility if the stream appears to be + compressed. This requires making a temporary copy of the data + * add -N option, to truncate filenames. + * use getc_unlocked() rather than fgetc_unlocked() + * modify to recognize Perforce-style diffs (patch by Ed Schouten). + ------------------------------------------------------------------- Mon Mar 30 11:29:12 CEST 2009 - pgajdos@suse.cz diff --git a/diffstat.spec b/diffstat.spec index 3534a48..36afa40 100644 --- a/diffstat.spec +++ b/diffstat.spec @@ -1,5 +1,5 @@ # -# spec file for package diffstat (Version 1.47) +# spec file for package diffstat (Version 1.48) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: diffstat -Version: 1.47 +Version: 1.48 Release: 1 AutoReqProv: on Group: Productivity/Text/Utilities -License: X11/MIT +License: MIT License (or similar) Url: http://dickey.his.com/diffstat/diffstat.html Summary: Utility That Provides Statistics Based on the Output of diff Source: %{name}-%{version}.tar.bz2 @@ -66,58 +66,3 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %changelog -* Mon Mar 30 2009 pgajdos@suse.cz -- updated to 1.47 version: - * Modified to work with patch ".rej" files. -* Thu Sep 11 2008 pgajdos@suse.cz -- update to 1.46 version: - * add "-S", "-D" and "-m" options to provide a way to show the amount - of difference relative to the total sizes of the files. - * add "-q" option (patch by Greg Norris). -* Tue Dec 11 2007 pgajdos@suse.cz -- update to 1.45 - * add "-b" option (Debian #379380, patch by - Greg Norris). - * add a check for default-diff output, e.g., "diff foo - bar|diffstat", which has no "diff" command in the - output for diffstat to guess that a diff is beginning. - * add a check after completing a chunk for unified diff - to ensure that the next line either begins another chunk - for the diff, or starts another diff, e.g., a context - diff (report by Adrian Bunk). - * add configure options for leak-checking valgrind, etc. - * use install-sh rather than install.sh - * updated config.guess and config.sub - * updated configure macros CF_GCC_ATTRIBUTES CF_GCC_WARNINGS - CF_MSG_LOG CF_PATH_SYNTAX CF_VERBOSE CF_XOPEN_SOURCE -* Thu Jul 27 2006 mjancar@suse.cz -- update to 1.43 - * fix to avoid modifying data which is being used by tsearch() for - ordering the binary tree (report by Adrian Bunk). - * do not ignore pathnames in /tmp/, since some tools create usable - pathnames for both old/new files there (Debian #376086). - * correct ifdef for fgetc_unlocked(). - * updated configure macros CF_GCC_VERSION, CF_PATH_SYNTAX and - CF_XOPEN_SOURCE - * add configure check for compress, gzip and bzip2 programs that may be - used to decompress files. -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Thu Jan 12 2006 mjancar@suse.cz -- update to 1.41 -* Mon Aug 01 2005 mjancar@suse.cz -- update to 1.39 -* Thu Feb 24 2005 mjancar@suse.cz -- update to 1.38 -* Fri Feb 27 2004 mjancar@suse.cz -- update to 1.34 -* Thu Jul 24 2003 mjancar@suse.cz -- update to 1.33 -* Fri Nov 23 2001 cihlar@suse.cz -- update to version 1.29 - * add bzip2 (.bz2) suffix - * add check for diff from RCS archive where the - "diff" lines do not reference a filename -- added Url: -* Thu Oct 19 2000 cihlar@suse.cz -- package created