diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..34292d8 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +xferstats-2.16.tar.gz diff --git a/dead.package b/dead.package deleted file mode 100644 index 5784d07..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -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 new file mode 100644 index 0000000..eb54cfc --- /dev/null +++ b/sources @@ -0,0 +1 @@ +d3281d6eeef8d04856a17f6d05c326a2 xferstats-2.16.tar.gz diff --git a/xferstats-2.16-config-loc.patch b/xferstats-2.16-config-loc.patch new file mode 100644 index 0000000..d984d8a --- /dev/null +++ b/xferstats-2.16-config-loc.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 0000000..735e6d2 --- /dev/null +++ b/xferstats-2.16-display.patch @@ -0,0 +1,98 @@ +--- 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-glib2.patch b/xferstats-glib2.patch new file mode 100644 index 0000000..78f6813 --- /dev/null +++ b/xferstats-glib2.patch @@ -0,0 +1,36 @@ +--- 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 new file mode 100644 index 0000000..dd2c701 --- /dev/null +++ b/xferstats.patch @@ -0,0 +1,75 @@ +--- 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 new file mode 100644 index 0000000..984195c --- /dev/null +++ b/xferstats.spec @@ -0,0 +1,130 @@ +Summary: Compiles information about file transfers from logfiles +Name: xferstats +Version: 2.16 +Release: 20%{?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 +License: GPLv2+ +Group: Applications/System +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildPrereq: glib2-devel +BuildPrereq: autoconf + +%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 + +%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 +rm -rf $RPM_BUILD_ROOT +%makeinstall DESTDIR=%{buildroot} + +mkdir -p %{buildroot}%{_datadir}/xferstats/ +cp -a graphs %{buildroot}%{_datadir}/xferstats/ + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc ChangeLog +%config(noreplace) %{_sysconfdir}/xferstats.cfg +%{_bindir}/xferstats +%{_mandir}/*/* +%{_datadir}/xferstats + +%changelog +* 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