From c161e4db8d207b2c9632a7262a345d84d65b1638 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:22:03 +0000 Subject: [PATCH 01/15] Initialize branch F-12 for xferstats --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From f5601e3df1806acf86a3d9b80f9f823c0001ee3c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:40:58 +0000 Subject: [PATCH 02/15] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5116363..8dde592 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xferstats -# $Id: Makefile,v 1.1 2004/09/09 14:42:36 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:31:49 notting Exp $ NAME := xferstats SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 10a917a92c426ecb1fdddbb8f01290a45afd8ab9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:32:48 +0000 Subject: [PATCH 03/15] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5116363..8dde592 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xferstats -# $Id: Makefile,v 1.1 2004/09/09 14:42:36 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:31:49 notting Exp $ NAME := xferstats SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From b96b7aa4ec426ee2335077e81bc2b5cf248e9946 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:49:55 +0000 Subject: [PATCH 04/15] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8dde592..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xferstats -# $Id: Makefile,v 1.2 2007/10/15 19:31:49 notting Exp $ -NAME := xferstats -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 From c66de7d5253019b0ebb0719a83d5e86913528992 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:49:57 +0000 Subject: [PATCH 05/15] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8dde592..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xferstats -# $Id: Makefile,v 1.2 2007/10/15 19:31:49 notting Exp $ -NAME := xferstats -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From d35c6233bf2cdc50a1898e9bd7ffcb48ece2e6f8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:01:05 -0600 Subject: [PATCH 06/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xferstats.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xferstats.spec b/xferstats.spec index 984195c..f462857 100644 --- a/xferstats.spec +++ b/xferstats.spec @@ -1,7 +1,7 @@ Summary: Compiles information about file transfers from logfiles Name: xferstats Version: 2.16 -Release: 20%{?dist} +Release: 21%{?dist} URL: http://xferstats.off.net/ Source0: ftp://xferstats.off.net/%{name}-%{version}.tar.gz Patch0: xferstats.patch @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xferstats %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 2.16-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jul 27 2009 Fedora Release Engineering - 2.16-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 07c9211d6d0788b157952ca6e345e2aa50554801 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Thu, 5 Jan 2012 09:34:15 +0100 Subject: [PATCH 07/15] Rebuilt for GCC 4.7 --- xferstats.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xferstats.spec b/xferstats.spec index f462857..58fd896 100644 --- a/xferstats.spec +++ b/xferstats.spec @@ -1,7 +1,7 @@ Summary: Compiles information about file transfers from logfiles Name: xferstats Version: 2.16 -Release: 21%{?dist} +Release: 22%{?dist} URL: http://xferstats.off.net/ Source0: ftp://xferstats.off.net/%{name}-%{version}.tar.gz Patch0: xferstats.patch @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xferstats %changelog +* Thu Jan 05 2012 Jan Synáček - 2.16-22 +- Rebuilt for GCC 4.7 + * Mon Feb 07 2011 Fedora Release Engineering - 2.16-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From d69298cf7b6aca3c3c0ec2c271c86a46e37fc320 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Thu, 19 Jul 2012 11:15:51 +0200 Subject: [PATCH 08/15] Make fedora-review-friendly --- xferstats.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xferstats.spec b/xferstats.spec index 58fd896..c799561 100644 --- a/xferstats.spec +++ b/xferstats.spec @@ -10,10 +10,8 @@ Patch2: xferstats-2.16-display.patch Patch3: xferstats-glib2.patch License: GPLv2+ Group: Applications/System -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildPrereq: glib2-devel -BuildPrereq: autoconf +BuildRequires: autoconf, glib2-devel %description xferstats compiles information about file transfers from logfiles. @@ -44,7 +42,6 @@ cp -a graphs %{buildroot}%{_datadir}/xferstats/ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) %doc ChangeLog %config(noreplace) %{_sysconfdir}/xferstats.cfg %{_bindir}/xferstats @@ -52,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xferstats %changelog +* Thu Jul 19 2012 Jan Synáček - 2.16-22 +- Make fedora-review-friendly + * Thu Jan 05 2012 Jan Synáček - 2.16-22 - Rebuilt for GCC 4.7 From 9e03975b2730aa60c940af14485e061d6e83726a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 00:26:17 -0500 Subject: [PATCH 09/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xferstats.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xferstats.spec b/xferstats.spec index c799561..f7b4637 100644 --- a/xferstats.spec +++ b/xferstats.spec @@ -1,7 +1,7 @@ Summary: Compiles information about file transfers from logfiles Name: xferstats Version: 2.16 -Release: 22%{?dist} +Release: 23%{?dist} URL: http://xferstats.off.net/ Source0: ftp://xferstats.off.net/%{name}-%{version}.tar.gz Patch0: xferstats.patch @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xferstats %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 2.16-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jul 19 2012 Jan Synáček - 2.16-22 - Make fedora-review-friendly From 714006e124a17feb09026b518f8209b4ae45ab8c Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Wed, 22 Aug 2012 13:15:15 +0200 Subject: [PATCH 10/15] Fix changelog entry --- xferstats.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xferstats.spec b/xferstats.spec index f7b4637..a248aea 100644 --- a/xferstats.spec +++ b/xferstats.spec @@ -1,7 +1,7 @@ Summary: Compiles information about file transfers from logfiles Name: xferstats Version: 2.16 -Release: 23%{?dist} +Release: 24%{?dist} URL: http://xferstats.off.net/ Source0: ftp://xferstats.off.net/%{name}-%{version}.tar.gz Patch0: xferstats.patch @@ -49,11 +49,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xferstats %changelog +* Wed Aug 22 2012 Jan Synáček - 2.16-24 +- Fix changelog entry + * Sun Jul 22 2012 Fedora Release Engineering - 2.16-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Thu Jul 19 2012 Jan Synáček - 2.16-22 -- Make fedora-review-friendly +* Thu Jul 19 2012 Jan Synáček - 2.16-23 +- Make fedora-review friendly * Thu Jan 05 2012 Jan Synáček - 2.16-22 - Rebuilt for GCC 4.7 From 7e961f03f508cd76566fa44a550cdff4bf0a5bda Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Wed, 22 Aug 2012 13:16:28 +0200 Subject: [PATCH 11/15] Make even more fedora-review friendly --- xferstats.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/xferstats.spec b/xferstats.spec index a248aea..035ca9b 100644 --- a/xferstats.spec +++ b/xferstats.spec @@ -32,15 +32,11 @@ autoconf make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -%makeinstall DESTDIR=%{buildroot} +%make_install DESTDIR=%{buildroot} mkdir -p %{buildroot}%{_datadir}/xferstats/ cp -a graphs %{buildroot}%{_datadir}/xferstats/ -%clean -rm -rf $RPM_BUILD_ROOT - %files %doc ChangeLog %config(noreplace) %{_sysconfdir}/xferstats.cfg @@ -51,6 +47,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Wed Aug 22 2012 Jan Synáček - 2.16-24 - Fix changelog entry +- Make even more fedora-review friendly * Sun Jul 22 2012 Fedora Release Engineering - 2.16-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 657e2ba343235f08252b60d8457f1205aff5e861 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 21:42:40 -0600 Subject: [PATCH 12/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xferstats.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xferstats.spec b/xferstats.spec index 035ca9b..766cb42 100644 --- a/xferstats.spec +++ b/xferstats.spec @@ -1,7 +1,7 @@ Summary: Compiles information about file transfers from logfiles Name: xferstats Version: 2.16 -Release: 24%{?dist} +Release: 25%{?dist} URL: http://xferstats.off.net/ Source0: ftp://xferstats.off.net/%{name}-%{version}.tar.gz Patch0: xferstats.patch @@ -45,6 +45,9 @@ cp -a graphs %{buildroot}%{_datadir}/xferstats/ %{_datadir}/xferstats %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 2.16-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Aug 22 2012 Jan Synáček - 2.16-24 - Fix changelog entry - Make even more fedora-review friendly From ba911e65e728b3cdce39cb7c91d34f22224c8e0f Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Thu, 4 Apr 2013 10:50:35 +0200 Subject: [PATCH 13/15] Add missing option to manpage --- xferstats-2.16-man.patch | 12 ++++++++++++ xferstats.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 xferstats-2.16-man.patch diff --git a/xferstats-2.16-man.patch b/xferstats-2.16-man.patch new file mode 100644 index 0000000..9f7bd59 --- /dev/null +++ b/xferstats-2.16-man.patch @@ -0,0 +1,12 @@ +--- xferstats-2.16/xferstats.8 2013-04-04 10:47:07.647973912 +0200 ++++ xferstats-2.16/xferstats.8.new 2013-04-04 10:46:28.000000000 +0200 +@@ -145,6 +145,9 @@ + When enabled, xferstats will generate a report listing traffic by month + (January, February, etc.) + .TP ++.B S ++When enabled, xferstats will generate a report listing traffic by file size ++.TP + .B w + When enabled, xferstats will generate a report listing traffic by day of the + week (Monday, Tuesday, etc.) diff --git a/xferstats.spec b/xferstats.spec index 766cb42..3533d17 100644 --- a/xferstats.spec +++ b/xferstats.spec @@ -1,13 +1,14 @@ Summary: Compiles information about file transfers from logfiles Name: xferstats Version: 2.16 -Release: 25%{?dist} +Release: 26%{?dist} URL: http://xferstats.off.net/ Source0: ftp://xferstats.off.net/%{name}-%{version}.tar.gz Patch0: xferstats.patch Patch1: xferstats-2.16-config-loc.patch Patch2: xferstats-2.16-display.patch Patch3: xferstats-glib2.patch +Patch4: xferstats-2.16-man.patch License: GPLv2+ Group: Applications/System @@ -23,6 +24,7 @@ xferstats compiles information about file transfers from logfiles. %patch1 -p1 -b .config %patch2 -p1 -b .display %patch3 -p1 -b .glib2 +%patch4 -p1 -b .man %build sed -e "s,PKG_PROG_PKG_CONFIG.*,PKG_CONFIG=%{_bindir}/pkg-config," %{_datadir}/aclocal/glib-2.0.m4 >aclocal.m4 @@ -45,6 +47,9 @@ cp -a graphs %{buildroot}%{_datadir}/xferstats/ %{_datadir}/xferstats %changelog +* Thu Apr 04 2013 Jan Synáček - 2.16-26 +- Add missing option to manpage + * Fri Feb 15 2013 Fedora Release Engineering - 2.16-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From f891b784f0de540a70afa27580f445ca93f42ba2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 03:11:38 -0500 Subject: [PATCH 14/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xferstats.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xferstats.spec b/xferstats.spec index 3533d17..b3732c9 100644 --- a/xferstats.spec +++ b/xferstats.spec @@ -1,7 +1,7 @@ Summary: Compiles information about file transfers from logfiles Name: xferstats Version: 2.16 -Release: 26%{?dist} +Release: 27%{?dist} URL: http://xferstats.off.net/ Source0: ftp://xferstats.off.net/%{name}-%{version}.tar.gz Patch0: xferstats.patch @@ -47,6 +47,9 @@ cp -a graphs %{buildroot}%{_datadir}/xferstats/ %{_datadir}/xferstats %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 2.16-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Apr 04 2013 Jan Synáček - 2.16-26 - Add missing option to manpage From 2c15e12699be90fe25538d8dfc46e63a178fafea Mon Sep 17 00:00:00 2001 From: Till Maas Date: Wed, 4 Jun 2014 20:16:08 +0200 Subject: [PATCH 15/15] 2014-06-04 - This package was already retired in pkgdb/blocked in koji, but no dead.package file existed. The original retirement reason is unclear. --- .gitignore | 1 - dead.package | 1 + sources | 1 - xferstats-2.16-config-loc.patch | 11 --- xferstats-2.16-display.patch | 98 --------------------- xferstats-2.16-man.patch | 12 --- xferstats-glib2.patch | 36 -------- xferstats.patch | 75 ---------------- xferstats.spec | 150 -------------------------------- 9 files changed, 1 insertion(+), 384 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xferstats-2.16-config-loc.patch delete mode 100644 xferstats-2.16-display.patch delete mode 100644 xferstats-2.16-man.patch delete mode 100644 xferstats-glib2.patch delete mode 100644 xferstats.patch delete mode 100644 xferstats.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 34292d8..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -xferstats-2.16.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5784d07 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +2014-06-04 - This package was already retired in pkgdb/blocked in koji, but no dead.package file existed. The original retirement reason is unclear. diff --git a/sources b/sources deleted file mode 100644 index eb54cfc..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -d3281d6eeef8d04856a17f6d05c326a2 xferstats-2.16.tar.gz diff --git a/xferstats-2.16-config-loc.patch b/xferstats-2.16-config-loc.patch deleted file mode 100644 index d984d8a..0000000 --- a/xferstats-2.16-config-loc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xferstats-2.16/xferstats.h.orig Mon Apr 23 09:46:05 2001 -+++ xferstats-2.16/xferstats.h Mon Apr 23 09:46:32 2001 -@@ -57,7 +57,7 @@ - - /* Also self-explanitory. The default place to look for the xferstats config - * information */ --#define DEFAULT_CONFIG "/usr/local/etc/xferstats.cfg" -+#define DEFAULT_CONFIG "/etc/xferstats.cfg" - - /* The default xferlog filename */ - #define FILENAME "/var/log/xferlog" diff --git a/xferstats-2.16-display.patch b/xferstats-2.16-display.patch deleted file mode 100644 index 735e6d2..0000000 --- a/xferstats-2.16-display.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- xferstats-2.16.dist/display.c Tue Oct 31 14:13:04 2000 -+++ xferstats-2.16/display.c Tue May 27 15:21:01 2003 -@@ -602,10 +602,10 @@ - pointers->high_date); - } - fprintf(html, "\n"); - fprintf(html, "\n"); - break; - case T_HOST: -@@ -623,9 +623,9 @@ - pointers->high_date); - } - fprintf(html, "
Number Of" -- "Number ofAveragePercent " -+ "CompletedNumber ofAveragePercent " - "OfPercent Of
Top Level DomainFiles Sent" -- "Bytes SentXmit RateFiles" -+ "TransfersBytes SentXmit RateFiles" - " SentBytes Sent
\n"); -- fprintf(html, "\n"); - break; -@@ -644,9 +644,9 @@ - pointers->high_date); - } - fprintf(html, "
Number Of" -- "Number ofAveragePercent " -+ "CompletedNumber ofAveragePercent " - "OfPercent Of
HostFiles SentBytes" -+ fprintf(html, "
HostFiles SentTransfersBytes" - " SentXmit RateFiles Sent" - "Bytes Sent
\n"); -- fprintf(html, "\n"); - break; -@@ -655,9 +655,9 @@ - "%s to %s
\n", - pointers->low_date, pointers->high_date); - fprintf(html, "
Number Of" -- "Number ofAveragePercent " -+ "CompletedNumber ofAveragePercent " - "OfPercent Of
DomainFiles Sent" -+ fprintf(html, "
DomainFiles SentTransfers" - "Bytes SentXmit RateFiles Sent" - "Bytes Sent
\n"); -- fprintf(html, "\n"); - break; ---- xferstats-2.16.dist/display.c Tue Oct 31 14:13:04 2000 -+++ xferstats-2.16/display.c Tue May 27 18:24:41 2003 -@@ -275,7 +275,7 @@ - /* skip all of the entries before the last 'n' dictated by - * number_daily_stats */ - if (pointers->config->number_daily_stats) -- count = num_days - pointers->config->number_daily_stats + 1; -+ count = num_days - pointers->config->number_daily_stats; - if (count < 0) count = 0; - } - -@@ -284,16 +284,12 @@ - displayed_count++; - - if (pointers->config->number_daily_stats && -- displayed_count >= pointers->config->number_daily_stats) -+ displayed_count > pointers->config->number_daily_stats) - break; - -- if (displayed_count == 1 || !pointers->config->number_daily_stats || -- pointers->config->number_daily_stats > num_days || -- displayed_count > num_days - pointers->config->number_daily_stats) -- { - if (displayed_count == 1 || - (pointers->config->max_report_size && -- !(displayed_count % (pointers->config->max_report_size + 1)))) -+ !((displayed_count - 1) % pointers->config->max_report_size))) - { - /* print our headers */ - if (pointers->config->html_output) -@@ -350,7 +346,6 @@ - printf("--------------- ---------- ----------- --------- ---------- ----------\n"); - } - } -- } - - if (pointers->config->html_output) - { -@@ -488,7 +483,7 @@ - - if (count == 1 || - (pointers->config->max_report_size && -- !(count % (pointers->config->max_report_size + 1)))) -+ !((count - 1) % pointers->config->max_report_size))) - { - if (pointers->config->html_output) - { diff --git a/xferstats-2.16-man.patch b/xferstats-2.16-man.patch deleted file mode 100644 index 9f7bd59..0000000 --- a/xferstats-2.16-man.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- xferstats-2.16/xferstats.8 2013-04-04 10:47:07.647973912 +0200 -+++ xferstats-2.16/xferstats.8.new 2013-04-04 10:46:28.000000000 +0200 -@@ -145,6 +145,9 @@ - When enabled, xferstats will generate a report listing traffic by month - (January, February, etc.) - .TP -+.B S -+When enabled, xferstats will generate a report listing traffic by file size -+.TP - .B w - When enabled, xferstats will generate a report listing traffic by day of the - week (Monday, Tuesday, etc.) diff --git a/xferstats-glib2.patch b/xferstats-glib2.patch deleted file mode 100644 index 78f6813..0000000 --- a/xferstats-glib2.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- xferstats-2.16/configure.in.moo 2006-04-04 11:52:55.000000000 -0400 -+++ xferstats-2.16/configure.in 2006-04-04 11:53:55.000000000 -0400 -@@ -157,9 +157,9 @@ - if test x$with_glib = x ; then - # Look for separately installed glib - -- AM_PATH_GLIB(1.1.3,, -+ AM_PATH_GLIB_2_0(2.0.0,, - AC_MSG_ERROR([ --*** GLIB 1.1.3 or better is required. The latest version of GLIB -+*** GLIB 2.0.0 or better is required. The latest version of GLIB - *** is always available from ftp://ftp.gtk.org.]), - gmodule) - -@@ -168,17 +168,17 @@ - else - # Use uninstalled glib (assume they got the version right) - -- if test -x $with_glib/glib-config ; then -+ if test -x $with_glib/pkg-config ; then - : - else - AC_MSG_ERROR([GLIB directory ($with_glib) not present or not configured]) - fi - - # For use in gtk-config -- glib_cflags=`$with_glib/glib-config --cflags` -- glib_libs=`$with_glib/glib-config --libs` -+ glib_cflags=`$with_glib/pkg-config --cflags glib-2.0` -+ glib_libs=`$with_glib/pkg-config --libs glib-2.0` - -- glib_release=`$with_glib/glib-config --version | sed 's%\\.[[0-9]]*$%%'` -+ glib_release=`$with_glib/pkg-config --modversion glib-2.0 | sed 's%\\.[[0-9]]*$%%'` - - # canonicalize relative paths - case $with_glib in diff --git a/xferstats.patch b/xferstats.patch deleted file mode 100644 index dd2c701..0000000 --- a/xferstats.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- xferstats-2.16/Makefile.in.orig Tue Oct 31 00:48:07 2000 -+++ xferstats-2.16/Makefile.in Thu Dec 14 11:09:55 2000 -@@ -23,15 +23,16 @@ - # Add any options here - DEFAULT_CONFIGURE_OPTIONS = - --prefix = @prefix@ --exec_prefix = @exec_prefix@ -+DESTDIR = -+prefix = $(DESTDIR)@prefix@ -+exec_prefix = $(DESTDIR)@exec_prefix@ - CFLAGS = $(DEFS) @CFLAGS@ @GLIB_CFLAGS@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - CC = @CC@ - PROGS = xferstats --BINDIR = @bindir@ --MANDIR = @mandir@ -+BINDIR = $(DESTDIR)@bindir@ -+MANDIR = $(DESTDIR)@mandir@ - INSTALL = @INSTALL@ - SRC = config.c display.c parselog.c xferstats.c - OBJ = $(SRC:.c=.o) -@@ -53,13 +54,13 @@ - install: $(PROGS) - ${INSTALL} -d ${BINDIR} - ${INSTALL} -d ${MANDIR}/man8 -- ${INSTALL} -d ${prefix}/etc -+ ${INSTALL} -d $(DESTDIR)/etc - @set -x ;for i in $(PROGS) ; do \ - ${INSTALL} -c -m 755 $$i ${BINDIR} ; done - @echo Installing man page... - ${INSTALL} -c -m 644 xferstats.8 ${MANDIR}/man8/xferstats.8 - @echo Installing configuration file... -- ${INSTALL} -c -m 644 xferstats.cfg ${prefix}/etc/xferstats.cfg -+ ${INSTALL} -c -m 644 xferstats.cfg $(DESTDIR)/etc/xferstats.cfg - - clean: - rm -f $(PROGS) $(OBJ) ---- xferstats-2.16/xferstats.8.orig Tue Oct 31 14:04:43 2000 -+++ xferstats-2.16/xferstats.8 Thu Dec 14 11:09:55 2000 -@@ -44,7 +44,7 @@ - .BI \-c " configuration file" - Specify an alternate path and filename for the configuration file. The packaged - default is --.I /usr/local/etc/xferstats.cfg -+.I /etc/xferstats.cfg - but your administrator may have changed this. A new default can be set by - changing the appropriate variable in xferstats.h and recompiling. - .TP -@@ -243,7 +243,7 @@ - .SH CONFIGURATION FILE - .P - The default configuration file path is --.I /usr/local/etc/xferstats.cfg -+.I /etc/xferstats.cfg - although your administrator may have changed this. - .P - Any text after a '#' is ignored, as long as the '#' begins a line or is -@@ -547,13 +547,12 @@ - .B xferlog - (generated by wu-ftpd or ncftpd) - .P --.B /usr/local/etc/xferstats.cfg -+.B /etc/xferstats.cfg - contains all of the default settings and many settings which cannot be set from - the command line. - .P - If you installed the RPM version of xferstats, you'll find the JPGs for the --graphs in /usr/doc/xferstats-x.xx/graphs Insert the version you're running in --place of the x.xx. -+graphs in /usr/share/xferstats/graphs. - - .SH BUGS - The JPG graph pieces included are not ideal; sometimes artifacts show up. I diff --git a/xferstats.spec b/xferstats.spec deleted file mode 100644 index b3732c9..0000000 --- a/xferstats.spec +++ /dev/null @@ -1,150 +0,0 @@ -Summary: Compiles information about file transfers from logfiles -Name: xferstats -Version: 2.16 -Release: 27%{?dist} -URL: http://xferstats.off.net/ -Source0: ftp://xferstats.off.net/%{name}-%{version}.tar.gz -Patch0: xferstats.patch -Patch1: xferstats-2.16-config-loc.patch -Patch2: xferstats-2.16-display.patch -Patch3: xferstats-glib2.patch -Patch4: xferstats-2.16-man.patch -License: GPLv2+ -Group: Applications/System - -BuildRequires: autoconf, glib2-devel - -%description -xferstats compiles information about file transfers from logfiles. - -%prep -%setup -q - -%patch0 -p1 -%patch1 -p1 -b .config -%patch2 -p1 -b .display -%patch3 -p1 -b .glib2 -%patch4 -p1 -b .man - -%build -sed -e "s,PKG_PROG_PKG_CONFIG.*,PKG_CONFIG=%{_bindir}/pkg-config," %{_datadir}/aclocal/glib-2.0.m4 >aclocal.m4 -autoconf -%configure - -make %{?_smp_mflags} - -%install -%make_install DESTDIR=%{buildroot} - -mkdir -p %{buildroot}%{_datadir}/xferstats/ -cp -a graphs %{buildroot}%{_datadir}/xferstats/ - -%files -%doc ChangeLog -%config(noreplace) %{_sysconfdir}/xferstats.cfg -%{_bindir}/xferstats -%{_mandir}/*/* -%{_datadir}/xferstats - -%changelog -* Sun Aug 04 2013 Fedora Release Engineering - 2.16-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Apr 04 2013 Jan Synáček - 2.16-26 -- Add missing option to manpage - -* Fri Feb 15 2013 Fedora Release Engineering - 2.16-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Aug 22 2012 Jan Synáček - 2.16-24 -- Fix changelog entry -- Make even more fedora-review friendly - -* Sun Jul 22 2012 Fedora Release Engineering - 2.16-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jul 19 2012 Jan Synáček - 2.16-23 -- Make fedora-review friendly - -* Thu Jan 05 2012 Jan Synáček - 2.16-22 -- Rebuilt for GCC 4.7 - -* Mon Feb 07 2011 Fedora Release Engineering - 2.16-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jul 27 2009 Fedora Release Engineering - 2.16-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 2.16-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Aug 12 2008 Jason L Tibbitts III - 2.16-18 -- Fix license tag. - -* Tue Feb 19 2008 Fedora Release Engineering - 2.16-17 -- Autorebuild for GCC 4.3 - -* Tue Jan 08 2008 Than Ngo 2.16-16 -- rebuilt - -* Thu Oct 18 2007 2.16-15 Than Ngo 2.16-15 -- rebuild - -* Wed Jul 12 2006 Jesse Keating - 2.16-14.1 -- rebuild - -* Tue Apr 14 2006 Bill Nottingham - 2.16-14 -- build against glib2 - -* Fri Feb 10 2006 Jesse Keating - 2.16-13.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 2.16-13.2 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Wed Mar 16 2005 Than Ngo 2.16-13 -- rebuilt against gcc 4 - -* Wed Feb 09 2005 Than Ngo 2.16-12 -- rebuilt - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Thu May 20 2004 Than Ngo 2.16-10 -- add BuildRequires on glib-devel, bug #123761 - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Tue Jun 3 2003 Than Ngo 2.16-7 -- add a patch file from Gilbert, which fixes incorrect line - counting for output reports #bug 91852 - -* Wed May 28 2003 Than Ngo 2.16-6 -- add mising "completed transfers" column from Gilbert E. Detillieux - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Wed Dec 11 2002 Tim Powers 2.16-4 -- rebuild on all arches - -* Thu Jul 11 2002 Preston Brown -- rebuild for mainline distro inclusion - -* Mon Apr 23 2001 Tim Powers -- fix where xferstats is expecting a config file, was in -/usr/local/etc, fixed to point to /etc (bug #36559) - -* Thu Dec 14 2000 Tim Powers -- Initial build. -- there aren't any docs outside of the Changelog for this, well, the - INSTALL file is there but that doesn't apply to the package at all -
Number Of" -- "Number ofAveragePercent " -+ "CompletedNumber ofAveragePercent " - "OfPercent Of
SizeFiles Sent" -+ fprintf(html, "
SizeFiles SentTransfers" - "Bytes SentXmit RateFiles Sent" - "Bytes Sent