rpms/socat/EL-5 .cvsignore, 1.2, 1.3 socat.spec, 1.3, 1.4 sources, 1.2, 1.3

[Paul Wouters]

Author: pwouters

Update of /cvs/extras/rpms/socat/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4227

Modified Files:
	.cvsignore socat.spec sources 
Log Message:
* Sat Jan 30 2010 Paul Wouters <paul at xelerance.com> - 1.7.1.2-1
- Upgraded to 1.7.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/socat/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Aug 2006 02:30:41 -0000	1.2
+++ .cvsignore	30 Jan 2010 21:57:37 -0000	1.3
@@ -1 +1,2 @@
 socat-1.5.0.0.tar.bz2
+socat-1.7.1.2.tar.gz


Index: socat.spec
===================================================================
RCS file: /cvs/extras/rpms/socat/EL-5/socat.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- socat.spec	20 Feb 2007 04:48:24 -0000	1.3
+++ socat.spec	30 Jan 2010 21:57:37 -0000	1.4
@@ -1,14 +1,14 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
-Version: 1.5.0.0
-Release: 5%{?dist}
+Version: 1.7.1.2
+Release: 1%{?dist}
 License: GPL
 Url:  http://www.dest-unreach.org/%{name}
-Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
+Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.gz
 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
+BuildRequires: openssl-devel readline-devel ncurses-devel
+BuildRequires: kernel-headers >= 2.6.18
 
 %description
 Socat is a relay for bidirectional data transfer between two independent data
@@ -20,9 +20,10 @@ line editor (readline), a program, or a 
 
 %prep
 %setup -q 
-# some linux ext2 defines moved into fs.h, patch sent to upstream.
-%patch0 -p0
+iconv -f iso8859-1 -t utf-8 CHANGES > CHANGES.utf8
+mv CHANGES.utf8 CHANGES
 
+%build
 %configure  \
         --enable-help --enable-stdio \
         --enable-fdnum --enable-file --enable-creat \
@@ -32,9 +33,8 @@ line editor (readline), a program, or a 
         --enable-listen --enable-proxy --enable-exec \
         --enable-system --enable-pty --enable-readline \
         --enable-openssl --enable-sycls --enable-filan \
-        --enable-retry --enable-libwrap
+        --enable-retry --enable-libwrap --disable-fips
 
-%build
 chmod 644 *.sh
 make %{?_smp_mflags}
 
@@ -49,7 +49,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/*.html
 %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 +59,9 @@ rm -rf %{buildroot}
 %doc %{_mandir}/man1/socat.1*
 
 %changelog
+* Sat Jan 30 2010 Paul Wouters <paul at xelerance.com> - 1.7.1.2-1
+- Upgraded to 1.7.1.2
+
 * Mon Feb 19 2007 Paul Wouters <paul at xelerance.com> 1.5.0.0-5
 - Some filesystem defines moved from their specific (ext2)
   filesystem defines into the generic <linux/fs.h>.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/socat/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 Aug 2006 02:30:41 -0000	1.2
+++ sources	30 Jan 2010 21:57:37 -0000	1.3
@@ -1 +1 @@
-84b709de13e236198a4606fb4b80e123  socat-1.5.0.0.tar.bz2
+2a5b7b0355421a039fb68b7541181b38  socat-1.7.1.2.tar.gz