From 361f81c10233f7251adcafc42ffba0d3a5c08e06 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Sep 04 2008 20:57:13 +0000
Subject: fix license tag, update to 1.6.0.1


---

diff --git a/socat.spec b/socat.spec
index 4260d7a..b1fd503 100644
--- a/socat.spec
+++ b/socat.spec
@@ -1,14 +1,13 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
-Version: 1.5.0.0
-Release: 8%{?dist}
-License: GPL
+Version: 1.6.0.1
+Release: 1%{?dist}
+License: GPLv2
 Url:  http://www.dest-unreach.org/%{name}
 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel readline-devel ncurses-devel kernel-headers > 2.6.18
-Patch0: socat-ext2.patch
 
 %description
 Socat is a relay for bidirectional data transfer between two independent data
@@ -20,11 +19,10 @@ line editor (readline), a program, or a combination of two of these.
 
 %prep
 %setup -q 
-# some linux ext2 defines moved into fs.h, patch sent to upstream.
-%patch0 -p0
 
+%build
 %configure  \
-        --enable-help --enable-stdio \
+	--enable-help --enable-stdio \
         --enable-fdnum --enable-file --enable-creat \
         --enable-gopen --enable-pipe --enable-termios \
         --enable-unix --enable-ip4 --enable-ip6 \
@@ -34,7 +32,6 @@ line editor (readline), a program, or a combination of two of these.
         --enable-openssl --enable-sycls --enable-filan \
         --enable-retry --enable-libwrap
 
-%build
 chmod 644 *.sh
 make %{?_smp_mflags}
 
@@ -49,7 +46,7 @@ rm -rf %{buildroot}
 %files 
 %defattr(-,root,root)
 %doc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ PORTING
-%doc COPYING* README SECURITY testcert.conf socat.html
+%doc COPYING* README SECURITY testcert.conf
 %doc daemon.sh ftp.sh gatherinfo.sh mail.sh proxy.sh 
 %doc proxyecho.sh readline.sh readline-test.sh
 %doc socks4echo.sh socks4a-echo.sh test.sh
@@ -59,6 +56,10 @@ rm -rf %{buildroot}
 %doc %{_mandir}/man1/socat.1*
 
 %changelog
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.6.0.1-1
+- fix license tag
+- update to 1.6.0.1
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.5.0.0-8
 - Autorebuild for GCC 4.3