[fedora-extras-commits] rpms/apachetop/devel apachetop-0.12-gcc34.patch, NONE, 1.1 apachetop.spec, 1.4, 1.5

[Michael Schwendt (mschwendt)]

Changeset from: mschwendt

Update of /cvs/extras/rpms/apachetop/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv7469

Modified Files:
	apachetop.spec 
Added Files:
	apachetop-0.12-gcc34.patch 
Log Message:
Fix build for FC3.

apachetop-0.12-gcc34.patch:

--- NEW FILE apachetop-0.12-gcc34.patch ---
diff -Nur apachetop-0.12-orig/src/hits_circle.cc apachetop-0.12/src/hits_circle.cc
--- apachetop-0.12-orig/src/hits_circle.cc	2004-05-13 17:43:46.000000000 +0200
+++ apachetop-0.12/src/hits_circle.cc	2004-11-11 12:03:49.000000000 +0100
@@ -16,8 +16,8 @@
 	pos = 0;
 	walkpos = 0;
 
-	tab = (struct circle_struct *)
-	    calloc(size, sizeof(struct circle_struct));
+	tab = (circle_struct *)
+	    calloc(size, sizeof(circle_struct));
 	if (!tab)
 	{
 		abort();
@@ -31,7 +31,7 @@
 
 int Hits_Circle::insert(struct logbits lb)
 {
-	struct circle_struct *posptr;
+	circle_struct *posptr;
 	short rc_tmp_old, rc_tmp_new;
 
 	/* insert the given data into the current position,
diff -Nur apachetop-0.12-orig/src/hits_circle.h apachetop-0.12/src/hits_circle.h
--- apachetop-0.12-orig/src/hits_circle.h	2004-05-13 17:43:46.000000000 +0200
+++ apachetop-0.12/src/hits_circle.h	2004-11-11 12:03:15.000000000 +0100
@@ -22,7 +22,7 @@
 	double rc_summary[6];
 
 	typedef struct logbits circle_struct;
-	struct circle_struct *tab;
+	circle_struct *tab;
 	int size; /* total size of circle table */
 	int pos; /* where are we now? */
 
diff -Nur apachetop-0.12-orig/src/log.cc apachetop-0.12/src/log.cc
--- apachetop-0.12-orig/src/log.cc	2004-05-10 17:47:56.000000000 +0200
+++ apachetop-0.12/src/log.cc	2004-11-11 12:09:26.409381856 +0100
@@ -72,7 +72,7 @@
 			/* fire off a query with adns */
 			b->dns_query = new adns_query;
 			adns_submit(adns, ptr, adns_r_a,
-			    (enum adns_queryflags) NULL, NULL, b->dns_query);
+			    (adns_queryflags) NULL, NULL, b->dns_query);
 
 			b->ip_pos = im->insert(RESOLVING_STRING);
 			b->ip_hash = TTHash(RESOLVING_STRING);
@@ -116,7 +116,7 @@
 
 			b->dns_query = new adns_query;
 			adns_submit_reverse(adns, (struct sockaddr *)&addr,
-			    adns_r_ptr, (enum adns_queryflags)adns_qf_owner,
+			    adns_r_ptr, (adns_queryflags)adns_qf_owner,
 			    NULL, b->dns_query);
 		}
 		else


Index: apachetop.spec
===================================================================
RCS file: /cvs/extras/rpms/apachetop/devel/apachetop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apachetop.spec	8 Nov 2004 04:03:34 -0000	1.4
+++ apachetop.spec	11 Nov 2004 11:14:06 -0000	1.5
@@ -1,13 +1,13 @@
 Name:           apachetop
 Version:        0.12
-Release:        0.fdr.1.2
-Epoch:          0
+Release:        2
 Summary:        A top-like display of Apache logs
 
 Group:          Applications/Internet
 License:        BSD
 URL:            http://clueful.shagged.org/apachetop
 Source0:        http://clueful.shagged.org/apachetop/files/apachetop-0.12.tar.gz
+Patch:          apachetop-0.12-gcc34.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel, m4, readline-devel
@@ -21,6 +21,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .gcc34
 
 
 %build
@@ -45,5 +46,8 @@
 
 
 %changelog
+* Thu Nov 11 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0.12-2
+- Fix build for FC3/GCC 3.4.
+
 * Sat May 22 2004 Aurelien Bompard <gauret[AT]free.fr> 0:0.12-0.fdr.1
 - Initial RPM release.