From 669369e96097669c2c696f26412f532deccc20ac1551bb31c8c5fa08c26365c4 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 12 Oct 2010 07:11:26 +0000 Subject: [PATCH 1/5] - updated to 1.54 + correct counts used for new files when -S/-D options are used. + minor typography improvement to manpage (patch by Solaris Designer) + remove the temporary directory on error, introduced in 1.48+ (patch by Solaris Designer). OBS-URL: https://build.opensuse.org/package/show/devel:tools/diffstat?expand=0&rev=11 --- diffstat-1.53.tar.bz2 | 3 --- diffstat-1.53.diff => diffstat-1.54.diff | 0 diffstat-1.54.tar.bz2 | 3 +++ diffstat.changes | 9 +++++++++ diffstat.spec | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 diffstat-1.53.tar.bz2 rename diffstat-1.53.diff => diffstat-1.54.diff (100%) create mode 100644 diffstat-1.54.tar.bz2 diff --git a/diffstat-1.53.tar.bz2 b/diffstat-1.53.tar.bz2 deleted file mode 100644 index 8171432..0000000 --- a/diffstat-1.53.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ed4680f354664af9cf31c4dcced30afc40e932be09a4e9496771deb015e16d8 -size 181539 diff --git a/diffstat-1.53.diff b/diffstat-1.54.diff similarity index 100% rename from diffstat-1.53.diff rename to diffstat-1.54.diff diff --git a/diffstat-1.54.tar.bz2 b/diffstat-1.54.tar.bz2 new file mode 100644 index 0000000..68bfe04 --- /dev/null +++ b/diffstat-1.54.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0026aa7d704d99e8d5d749b121e54c920d3df405bfb1ab13c0e649522bee4b05 +size 181867 diff --git a/diffstat.changes b/diffstat.changes index 59f462d..674f58c 100644 --- a/diffstat.changes +++ b/diffstat.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Oct 12 07:10:26 UTC 2010 - pgajdos@novell.com + +- updated to 1.54 + + correct counts used for new files when -S/-D options are used. + + minor typography improvement to manpage (patch by Solaris Designer) + + remove the temporary directory on error, introduced in 1.48+ (patch + by Solaris Designer). + ------------------------------------------------------------------- Tue Aug 24 12:24:10 CEST 2010 - pgajdos@suse.cz diff --git a/diffstat.spec b/diffstat.spec index b16db26..98b8e8d 100644 --- a/diffstat.spec +++ b/diffstat.spec @@ -19,7 +19,7 @@ Name: diffstat -Version: 1.53 +Version: 1.54 Release: 1 AutoReqProv: on Group: Productivity/Text/Utilities From eb899062d3ad2d3e293918991e9dbe46f847d1631bbf09d9b9738d88b065bfd6 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 14 Oct 2010 10:37:08 +0000 Subject: [PATCH 2/5] Accepting request 50295 from devel:tools checked in (request 50295) OBS-URL: https://build.opensuse.org/request/show/50295 OBS-URL: https://build.opensuse.org/package/show/devel:tools/diffstat?expand=0&rev=12 --- diffstat-1.54.diff => diffstat-1.53.diff | 0 diffstat-1.53.tar.bz2 | 3 +++ diffstat-1.54.tar.bz2 | 3 --- diffstat.changes | 9 --------- diffstat.spec | 2 +- 5 files changed, 4 insertions(+), 13 deletions(-) rename diffstat-1.54.diff => diffstat-1.53.diff (100%) create mode 100644 diffstat-1.53.tar.bz2 delete mode 100644 diffstat-1.54.tar.bz2 diff --git a/diffstat-1.54.diff b/diffstat-1.53.diff similarity index 100% rename from diffstat-1.54.diff rename to diffstat-1.53.diff diff --git a/diffstat-1.53.tar.bz2 b/diffstat-1.53.tar.bz2 new file mode 100644 index 0000000..8171432 --- /dev/null +++ b/diffstat-1.53.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ed4680f354664af9cf31c4dcced30afc40e932be09a4e9496771deb015e16d8 +size 181539 diff --git a/diffstat-1.54.tar.bz2 b/diffstat-1.54.tar.bz2 deleted file mode 100644 index 68bfe04..0000000 --- a/diffstat-1.54.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0026aa7d704d99e8d5d749b121e54c920d3df405bfb1ab13c0e649522bee4b05 -size 181867 diff --git a/diffstat.changes b/diffstat.changes index 674f58c..59f462d 100644 --- a/diffstat.changes +++ b/diffstat.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Tue Oct 12 07:10:26 UTC 2010 - pgajdos@novell.com - -- updated to 1.54 - + correct counts used for new files when -S/-D options are used. - + minor typography improvement to manpage (patch by Solaris Designer) - + remove the temporary directory on error, introduced in 1.48+ (patch - by Solaris Designer). - ------------------------------------------------------------------- Tue Aug 24 12:24:10 CEST 2010 - pgajdos@suse.cz diff --git a/diffstat.spec b/diffstat.spec index 98b8e8d..b16db26 100644 --- a/diffstat.spec +++ b/diffstat.spec @@ -19,7 +19,7 @@ Name: diffstat -Version: 1.54 +Version: 1.53 Release: 1 AutoReqProv: on Group: Productivity/Text/Utilities From a35aa464bf17ce5f4beade7aa74d0cf118bb86a58f2e1d342ec059bcd7c8dfc5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 20 Sep 2011 15:57:04 +0000 Subject: [PATCH 3/5] Accepting request 83254 from home:jengelh:bl-d - Remove redundant tags/sections from specfile (cf. packaging guidelines) - Use %_smp_mflags for parallel build OBS-URL: https://build.opensuse.org/request/show/83254 OBS-URL: https://build.opensuse.org/package/show/devel:tools/diffstat?expand=0&rev=13 --- diffstat-1.53.tar.bz2 | 3 --- diffstat-1.53.diff => diffstat-1.54.diff | 0 diffstat-1.54.tar.bz2 | 3 +++ diffstat.changes | 16 ++++++++++++++++ diffstat.spec | 24 +++++------------------- 5 files changed, 24 insertions(+), 22 deletions(-) delete mode 100644 diffstat-1.53.tar.bz2 rename diffstat-1.53.diff => diffstat-1.54.diff (100%) create mode 100644 diffstat-1.54.tar.bz2 diff --git a/diffstat-1.53.tar.bz2 b/diffstat-1.53.tar.bz2 deleted file mode 100644 index 8171432..0000000 --- a/diffstat-1.53.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ed4680f354664af9cf31c4dcced30afc40e932be09a4e9496771deb015e16d8 -size 181539 diff --git a/diffstat-1.53.diff b/diffstat-1.54.diff similarity index 100% rename from diffstat-1.53.diff rename to diffstat-1.54.diff diff --git a/diffstat-1.54.tar.bz2 b/diffstat-1.54.tar.bz2 new file mode 100644 index 0000000..68bfe04 --- /dev/null +++ b/diffstat-1.54.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0026aa7d704d99e8d5d749b121e54c920d3df405bfb1ab13c0e649522bee4b05 +size 181867 diff --git a/diffstat.changes b/diffstat.changes index 59f462d..e40374f 100644 --- a/diffstat.changes +++ b/diffstat.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile + (cf. packaging guidelines) +- Use %_smp_mflags for parallel build + +------------------------------------------------------------------- +Tue Oct 12 07:10:26 UTC 2010 - pgajdos@novell.com + +- updated to 1.54 + + correct counts used for new files when -S/-D options are used. + + minor typography improvement to manpage (patch by Solaris Designer) + + remove the temporary directory on error, introduced in 1.48+ (patch + by Solaris Designer). + ------------------------------------------------------------------- Tue Aug 24 12:24:10 CEST 2010 - pgajdos@suse.cz diff --git a/diffstat.spec b/diffstat.spec index b16db26..2d74d44 100644 --- a/diffstat.spec +++ b/diffstat.spec @@ -1,7 +1,7 @@ # -# spec file for package diffstat (Version 1.53) +# spec file for package diffstat # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: diffstat -Version: 1.53 +Version: 1.54 Release: 1 -AutoReqProv: on Group: Productivity/Text/Utilities License: MIT License (or similar) Url: http://dickey.his.com/diffstat/diffstat.html @@ -34,31 +32,19 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build diffstat reads the output of the diff command and displays a histogram of the insertions, deletions, and modifications in each file. - - -Authors: --------- - Thomas E. Dickey - %prep %setup -q %patch %build %{suse_update_config -f} -CFLAGS="$RPM_OPT_FLAGS -Wall" \ - ./configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --mandir=%{_mandir} +export CFLAGS="$RPM_OPT_FLAGS -Wall"; +%configure make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc README CHANGES From 244bb4d74c3adb713bf3249c59afbbe330d33ff9cba4b55a9d05c5956522edf6 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 22 Dec 2011 15:16:28 +0000 Subject: [PATCH 4/5] Accepting request 97688 from home:coolo:removeautoconf - remove call to suse_update_config (very old work around) OBS-URL: https://build.opensuse.org/request/show/97688 OBS-URL: https://build.opensuse.org/package/show/devel:tools/diffstat?expand=0&rev=14 --- diffstat.changes | 5 +++++ diffstat.spec | 11 ++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/diffstat.changes b/diffstat.changes index e40374f..6fa9fce 100644 --- a/diffstat.changes +++ b/diffstat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 20 20:15:42 UTC 2011 - coolo@suse.com + +- remove call to suse_update_config (very old work around) + ------------------------------------------------------------------- Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de diff --git a/diffstat.spec b/diffstat.spec index 2d74d44..e203f2f 100644 --- a/diffstat.spec +++ b/diffstat.spec @@ -15,15 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: diffstat Version: 1.54 -Release: 1 -Group: Productivity/Text/Utilities -License: MIT License (or similar) +Release: 0 Url: http://dickey.his.com/diffstat/diffstat.html Summary: Utility That Provides Statistics Based on the Output of diff +License: MIT +Group: Productivity/Text/Utilities Source: %{name}-%{version}.tar.bz2 Patch: %{name}-%{version}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -37,8 +35,7 @@ of the insertions, deletions, and modifications in each file. %patch %build -%{suse_update_config -f} -export CFLAGS="$RPM_OPT_FLAGS -Wall"; +export CFLAGS="$RPM_OPT_FLAGS -Wall" %configure make %{?_smp_mflags} From a922fafc8bf769cc087d49b3a9a836eec678691338e324b8f325c19c97b00cc7 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 4 Jan 2012 09:09:12 +0000 Subject: [PATCH 5/5] - updated to 1.55: * fixed [bnc#739210] -- on commercial license found in diffstat 1.54 (test files) * add -R option, like patch's, to reverse the order of the comparison. - switch on make check OBS-URL: https://build.opensuse.org/package/show/devel:tools/diffstat?expand=0&rev=15 --- diffstat-1.54.tar.bz2 | 3 --- diffstat.changes | 10 ++++++++++ diffstat-1.54.diff => diffstat.diff | 0 diffstat.spec | 14 +++++++++----- diffstat.tar.gz | 3 +++ 5 files changed, 22 insertions(+), 8 deletions(-) delete mode 100644 diffstat-1.54.tar.bz2 rename diffstat-1.54.diff => diffstat.diff (100%) create mode 100644 diffstat.tar.gz diff --git a/diffstat-1.54.tar.bz2 b/diffstat-1.54.tar.bz2 deleted file mode 100644 index 68bfe04..0000000 --- a/diffstat-1.54.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0026aa7d704d99e8d5d749b121e54c920d3df405bfb1ab13c0e649522bee4b05 -size 181867 diff --git a/diffstat.changes b/diffstat.changes index 6fa9fce..ac04e59 100644 --- a/diffstat.changes +++ b/diffstat.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jan 4 09:04:33 UTC 2012 - pgajdos@suse.com + +- updated to 1.55: + * fixed [bnc#739210] -- on commercial license found in diffstat + 1.54 (test files) + * add -R option, like patch's, to reverse the order of the + comparison. +- switch on make check + ------------------------------------------------------------------- Tue Dec 20 20:15:42 UTC 2011 - coolo@suse.com diff --git a/diffstat-1.54.diff b/diffstat.diff similarity index 100% rename from diffstat-1.54.diff rename to diffstat.diff diff --git a/diffstat.spec b/diffstat.spec index e203f2f..c960e97 100644 --- a/diffstat.spec +++ b/diffstat.spec @@ -1,7 +1,7 @@ # # spec file for package diffstat # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,22 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: diffstat -Version: 1.54 +Version: 1.55 Release: 0 Url: http://dickey.his.com/diffstat/diffstat.html Summary: Utility That Provides Statistics Based on the Output of diff License: MIT Group: Productivity/Text/Utilities -Source: %{name}-%{version}.tar.bz2 -Patch: %{name}-%{version}.diff +Source: ftp://invisible-island.net/diffstat/diffstat.tar.gz +Patch: %{name}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description diffstat reads the output of the diff command and displays a histogram of the insertions, deletions, and modifications in each file. -%prep +%prep -n diffstat %setup -q %patch @@ -42,6 +43,9 @@ make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install +%check +make check + %files %defattr(-,root,root) %doc README CHANGES diff --git a/diffstat.tar.gz b/diffstat.tar.gz new file mode 100644 index 0000000..7be0a21 --- /dev/null +++ b/diffstat.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59a46c75a99f2c373a81880051adc43a17b71c55478691e702c61c13c6d61b55 +size 235836