* Final commit for version 0.5.1

* Added RPM .spec file (Martin Maciaszek)
* Added Martin to AUTHORS

svn path=/trunk/; revision=149

9 files changed, 78 insertions, 10 deletions

diff --git a/AUTHORS b/AUTHORS
index 3110a56636..bf738c3800 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -56,6 +56,10 @@ Joerg Mayer      <jmayer@telemation.de> {
 	Banyan Vines support
 }
 
+Martin Maciaszek <fastjack@i-s-o.net> {
+	RPM .spec file
+}
+
 
 Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.
diff --git a/Makefile.am b/Makefile.am
index d0626b00fb..d1f7aad409 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,10 +93,11 @@ EXTRA_DIST =                \
 	doc/Makefile            \
 	doc/ethereal.pod        \
 	ethereal.1              \
+	ethereal.spec           \
 	image/icon-excl.xpm     \
 	image/icon-ethereal.xpm \
 	manuf                   \
 	print.ps                \
 	rdps.c
 
-SUBDIRS=@WIRETAP_DIR@
+SUBDIRS= wiretap
diff --git a/Makefile.in b/Makefile.in
index ec36358334..dbc4f29974 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -168,7 +168,7 @@ EXTRA_DIST =                \
 	print.ps                \
 	rdps.c
 
-SUBDIRS=@WIRETAP_DIR@
+SUBDIRS= wiretap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
diff --git a/NEWS b/NEWS
index 1ff5cc5afc..f272f992fb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,11 @@
 Overview of changes in Ethereal 0.5.1:
 * Updated Vines support (Joerg Mayer)
-* Bitfield decoding (Guy)
+* Bitfield decoding support (Guy)
 * GTK+ 1.1/1.2 support (Gilbert, Gerald)
 * Make TCP info more verbose (Gerald)
 * Fix resize problems w/main window (Gerald)
+* Fix time output (Gerald)
+* Add support for AIX iptrace files to wiretap (Gilbert)
 
 Overview of changes in Ethereal 0.5.0:
 * Initial release of wiretap library (Gilbert)
diff --git a/column.c b/column.c
index a661331a48..a9c21b7a92 100644
--- a/column.c
+++ b/column.c
@@ -1,7 +1,7 @@
 /* column.c
  * Routines for handling column preferences
  *
- * $Id: column.c,v 1.7 1998/12/29 04:05:33 gerald Exp $
+ * $Id: column.c,v 1.8 1999/01/04 01:31:17 gerald Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -83,8 +83,9 @@ col_format_to_string(gint fmt) {
   description */
 static gchar *
 col_format_desc(gint fmt) {
-  gchar *dlist[] = { "Number", "Time", "Relative time", "Absolute time",
-                     "Delta time", "Source address", "Src addr (resolved)",
+  gchar *dlist[] = { "Number", "Time (command line specified)",
+                     "Relative time", "Absolute time", "Delta time",
+                     "Source address", "Src addr (resolved)",
                      "Src addr (unresolved)", "Hardware src addr",
                      "Hw src addr (resolved)", "Hw src addr (unresolved)",
                      "Network src addr", "Net scr addr (resolved)",
@@ -348,7 +349,7 @@ col_format_to_pref_str() {
       if ((fmt_len + cur_pos) > MAX_FMT_PREF_LINE_LEN) {
         cur_len--;
         cur_pos = 0;
-        pref_str[cur_len] = '\n'; cur_len++;
+	        pref_str[cur_len] = '\n'; cur_len++;
         pref_str[cur_len] = '\t'; cur_len++;
       }
       sprintf(&pref_str[cur_len], "\"%s\", ", cfmt->title);
diff --git a/ethereal.spec b/ethereal.spec
new file mode 100644
index 0000000000..6d202de4f2
--- /dev/null
+++ b/ethereal.spec
@@ -0,0 +1,55 @@
+# Note that this is NOT a relocatable package
+%define ver      0.5.1
+%define rel      1
+%define prefix   /usr/X11R6
+
+Summary:	Network traffic analyzer
+Name:		ethereal
+Version:	%ver
+Release:	%rel
+Copyright:	GPL
+Group:		Networking/Utilities
+Source:		ethereal-%{PACKAGE_VERSION}.tar.gz
+URL:		http://ethereal.zing.org/
+BuildRoot:	/tmp/ethereal-%PACKAGE_VERSION}-root
+Packager:	FastJack <fastjack@i-s-o.net>
+Requires:	gtk+10
+Requires:	libpcap
+
+%description
+Ethereal is a network traffic analyzer for Unix-ish operating systems.
+
+%prep
+%setup
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --sysconfdir=/etc
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/{etc,usr/X11R6/bin,usr/X11R6/man/man1}
+
+# can't use make install here. It would put manuf directly into /etc
+cp ethereal $RPM_BUILD_ROOT/usr/X11R6/bin
+cp ethereal.1 $RPM_BUILD_ROOT/usr/X11R6/man/man1
+cp manuf $RPM_BUILD_ROOT/etc
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-, root, root)
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
+%config /etc/manuf
+/usr/X11R6/bin/ethereal
+/usr/X11R6/man/man1/ethereal.1
+
+%changelog
+* Sun Jan 01 1999 Gerald Combs <gerald@zing.org>
+- updated to 0.5.1
+
+* Fri Nov 20 1998 FastJack <fastjack@i-s-o.net>
+- updated to 0.5.0
+
+* Sun Nov 15 1998 FastJack <fastjack@i-s-o.net>
+- created .spec file
+
diff --git a/wiretap/Makefile b/wiretap/Makefile
index d4099f6be0..5aead28de9 100644
--- a/wiretap/Makefile
+++ b/wiretap/Makefile
@@ -74,6 +74,8 @@ libwiretap_a_SOURCES = \
 	config.h		\
 	debug.h			\
 	file.c			\
+	iptrace.c		\
+	iptrace.h		\
 	lanalyzer.c		\
 	lanalyzer.h		\
 	libpcap.c		\
@@ -96,7 +98,7 @@ CPPFLAGS =
 LDFLAGS = 
 LIBS =  -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -lglib -lXext -lX11 -lm
 libwiretap_a_LIBADD = 
-libwiretap_a_OBJECTS =  buffer.o file.o lanalyzer.o libpcap.o \
+libwiretap_a_OBJECTS =  buffer.o file.o iptrace.o lanalyzer.o libpcap.o \
 ngsniffer.o snoop.o wtap.o
 AR = ar
 CFLAGS = -Wall -g -O2 -I/usr/lib/glib/include -I/usr/X11R6/include
@@ -111,8 +113,9 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP = --best
-DEP_FILES =  .deps/buffer.P .deps/file.P .deps/lanalyzer.P \
-.deps/libpcap.P .deps/ngsniffer.P .deps/snoop.P .deps/wtap.P
+DEP_FILES =  .deps/buffer.P .deps/file.P .deps/iptrace.P \
+.deps/lanalyzer.P .deps/libpcap.P .deps/ngsniffer.P .deps/snoop.P \
+.deps/wtap.P
 SOURCES = $(libwiretap_a_SOURCES)
 OBJECTS = $(libwiretap_a_OBJECTS)
 
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 5a86399b8f..5a9cd55d1e 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -7,6 +7,7 @@ libwiretap_a_SOURCES = \
 	debug.h			\
 	file.c			\
 	iptrace.c		\
+	iptrace.h		\
 	lanalyzer.c		\
 	lanalyzer.h		\
 	libpcap.c		\
diff --git a/wiretap/Makefile.in b/wiretap/Makefile.in
index 548e49f00f..719243489b 100644
--- a/wiretap/Makefile.in
+++ b/wiretap/Makefile.in
@@ -75,6 +75,7 @@ libwiretap_a_SOURCES = \
 	debug.h			\
 	file.c			\
 	iptrace.c		\
+	iptrace.h		\
 	lanalyzer.c		\
 	lanalyzer.h		\
 	libpcap.c		\