From 1a69260eeb98e56fee319f1fae4cf0d56495fbd6 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 09:08:47 +0000
Subject: [PATCH] auto-import changelog data from net-tools-1.60-1.src.rpm Wed
 Apr 18 2001 Crutcher Dunnavant <crutcher@redhat.com> - itterate to 1.60

---
 .cvsignore                 |  2 +-
 net-tools-1.60-config.h    | 74 ++++++++++++++++++++++++++++++++++++++
 net-tools-1.60-config.make | 35 ++++++++++++++++++
 net-tools.spec             | 25 +++++--------
 sources                    |  2 +-
 5 files changed, 119 insertions(+), 19 deletions(-)
 create mode 100644 net-tools-1.60-config.h
 create mode 100644 net-tools-1.60-config.make

diff --git a/.cvsignore b/.cvsignore
index 0913675..08cf7d7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-net-tools-1.57.tar.bz2
+net-tools-1.60.tar.bz2
diff --git a/net-tools-1.60-config.h b/net-tools-1.60-config.h
new file mode 100644
index 0000000..71c7592
--- /dev/null
+++ b/net-tools-1.60-config.h
@@ -0,0 +1,74 @@
+/*
+* config.h	Automatically generated configuration includefile
+*
+* NET-TOOLS	A collection of programs that form the base set of the
+*		NET-3 Networking Distribution for the LINUX operating
+*		system.
+*
+*		DO  NOT  EDIT  DIRECTLY
+*
+*/
+
+/* 
+ * 
+ * Internationalization
+ * 
+ * The net-tools package has currently been translated to French,
+ * German and Brazilian Portugese.  Other translations are, of
+ * course, welcome.  Answer `n' here if you have no support for
+ * internationalization on your system.
+ * 
+ */
+#define I18N 1
+
+/* 
+ * 
+ * Protocol Families.
+ * 
+ */
+#define HAVE_AFUNIX 1
+#define HAVE_AFINET 1
+#define HAVE_AFINET6 1
+#define HAVE_AFIPX 1
+#define HAVE_AFATALK 1
+#define HAVE_AFAX25 1
+#define HAVE_AFNETROM 1
+#define HAVE_AFROSE 1
+#define HAVE_AFX25 1
+#define HAVE_AFECONET 1
+#define HAVE_AFDECnet 0
+#define HAVE_AFASH 1
+
+/* 
+ * 
+ * Device Hardware types.
+ * 
+ */
+#define HAVE_HWETHER 1
+#define HAVE_HWARC 1
+#define HAVE_HWSLIP 1
+#define HAVE_HWPPP 1
+#define HAVE_HWTUNNEL 1
+#define HAVE_HWSTRIP 1
+#define HAVE_HWTR 1
+#define HAVE_HWAX25 1
+#define HAVE_HWROSE 1
+#define HAVE_HWNETROM 1
+#define HAVE_HWX25 1
+#define HAVE_HWFR 1
+#define HAVE_HWSIT 1
+#define HAVE_HWFDDI 1
+#define HAVE_HWHIPPI 1
+#define HAVE_HWASH 1
+#define HAVE_HWHDLCLAPB 1
+#define HAVE_HWIRDA 1
+#define HAVE_HWEC 1
+
+/* 
+ * 
+ * Other Features.
+ * 
+ */
+#define HAVE_FW_MASQUERADE 1
+#define HAVE_IP_TOOLS 1
+#define HAVE_MII 1
diff --git a/net-tools-1.60-config.make b/net-tools-1.60-config.make
new file mode 100644
index 0000000..e6561c2
--- /dev/null
+++ b/net-tools-1.60-config.make
@@ -0,0 +1,35 @@
+I18N=1
+HAVE_AFUNIX=1
+HAVE_AFINET=1
+HAVE_AFINET6=1
+HAVE_AFIPX=1
+HAVE_AFATALK=1
+HAVE_AFAX25=1
+HAVE_AFNETROM=1
+HAVE_AFROSE=1
+HAVE_AFX25=1
+HAVE_AFECONET=1
+# HAVE_AFDECnet=0
+HAVE_AFASH=1
+HAVE_HWETHER=1
+HAVE_HWARC=1
+HAVE_HWSLIP=1
+HAVE_HWPPP=1
+HAVE_HWTUNNEL=1
+HAVE_HWSTRIP=1
+HAVE_HWTR=1
+HAVE_HWAX25=1
+HAVE_HWROSE=1
+HAVE_HWNETROM=1
+HAVE_HWX25=1
+HAVE_HWFR=1
+HAVE_HWSIT=1
+HAVE_HWFDDI=1
+HAVE_HWHIPPI=1
+HAVE_HWASH=1
+HAVE_HWHDLCLAPB=1
+HAVE_HWIRDA=1
+HAVE_HWEC=1
+HAVE_FW_MASQUERADE=1
+HAVE_IP_TOOLS=1
+HAVE_MII=1
diff --git a/net-tools.spec b/net-tools.spec
index da6f458..aaf80a3 100644
--- a/net-tools.spec
+++ b/net-tools.spec
@@ -1,19 +1,13 @@
 Summary: The basic tools for setting up networking.
 Name: net-tools
-Version: 1.57
-Release: 6
+Version: 1.60
+Release: 1
 Copyright: GPL
 Group: System Environment/Base
 Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
 Source1: net-tools-%{version}-config.h
 Source2: net-tools-%{version}-config.make
-Patch0: net-tools-1.57-fhs.patch
-Patch1: net-tools-1.57-bug9215.patch
-Patch2: net-tools-1.57-bug9129.patch
-Patch3: net-tools-1.57-bug20570.patch
 Patch4: net-tools-1.57-bug22040.patch
-Patch5: net-tools-1.57-bug25474.patch
-Patch6: net-tools-1.57-bug25921.patch
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -22,13 +16,7 @@ networking:  ethers, route and others.
 
 %prep
 %setup -q
-%patch0 -p 1 -b .fhs
-%patch1 -p 1 -b .bug9215
-%patch2 -p 1 -b .bug9129
-%patch3 -p 1 -b .bug20570
 %patch4 -p 1 -b .bug22040
-%patch5 -p 1 -b .bug25474
-%patch6 -p 1 -b .bug25921
 
 cp %SOURCE1 ./config.h
 cp %SOURCE2 ./config.make
@@ -54,11 +42,14 @@ rm -rf $RPM_BUILD_ROOT
 /bin/*
 /sbin/*
 %{_mandir}/man[158]/*
-%lang(de)	%{_mandir}/de/man[158]/*
-%lang(fr)	%{_mandir}/fr/man[158]/*
-%lang(pt_BR)	%{_mandir}/pt/man[158]/*
+%lang(de_DE)	%{_mandir}/de_DE/man[158]/*
+%lang(fr_FR)	%{_mandir}/fr_FR/man[158]/*
+%lang(pt_BR)	%{_mandir}/pt_BR/man[158]/*
 
 %changelog
+* Wed Apr 18 2001 Crutcher Dunnavant <crutcher@redhat.com>
+- itterate to 1.60
+
 * Sun Apr  8 2001 Preston Brown <pbrown@redhat.com>
 - use find_lang macro
 - less specific locale dirs for man pages
diff --git a/sources b/sources
index f31a84d..f1243ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5323c275b70e29ed13ea9db086f0c74c  net-tools-1.57.tar.bz2
+888774accab40217dde927e21979c165  net-tools-1.60.tar.bz2