- Updated to new upstream version
- utf8 the CHANGES file
This commit is contained in:
parent
0843f91c8e
commit
2cf690cca1
|
@ -1 +1,2 @@
|
||||||
socat-1.6.0.1.tar.bz2
|
socat-1.6.0.1.tar.bz2
|
||||||
|
socat-1.7.0.0.tar.bz2
|
||||||
|
|
13
socat.spec
13
socat.spec
|
@ -1,7 +1,12 @@
|
||||||
Summary: Bidirectional data relay between two data channels ('netcat++')
|
Summary: Bidirectional data relay between two data channels ('netcat++')
|
||||||
Name: socat
|
Name: socat
|
||||||
|
<<<<<<< socat.spec
|
||||||
|
Version: 1.7.0.0
|
||||||
|
Release: 1%{?dist}
|
||||||
|
=======
|
||||||
Version: 1.6.0.1
|
Version: 1.6.0.1
|
||||||
Release: 3%{?dist}
|
Release: 3%{?dist}
|
||||||
|
>>>>>>> 1.11
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Url: http://www.dest-unreach.org/%{name}
|
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.bz2
|
||||||
|
@ -19,10 +24,12 @@ line editor (readline), a program, or a combination of two of these.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
iconv -f iso8859-1 -t utf-8 CHANGES > CHANGES.utf8
|
||||||
|
mv CHANGES.utf8 CHANGES
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure \
|
%configure \
|
||||||
--enable-help --enable-stdio \
|
--enable-help --enable-stdio \
|
||||||
--enable-fdnum --enable-file --enable-creat \
|
--enable-fdnum --enable-file --enable-creat \
|
||||||
--enable-gopen --enable-pipe --enable-termios \
|
--enable-gopen --enable-pipe --enable-termios \
|
||||||
--enable-unix --enable-ip4 --enable-ip6 \
|
--enable-unix --enable-ip4 --enable-ip6 \
|
||||||
|
@ -56,6 +63,10 @@ rm -rf %{buildroot}
|
||||||
%doc %{_mandir}/man1/socat.1*
|
%doc %{_mandir}/man1/socat.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 20 2009 Paul Wouters <paul@xelerance.com 1.7.0.0-1
|
||||||
|
- Updated to new upstream version
|
||||||
|
- utf8 the CHANGES file
|
||||||
|
|
||||||
* Sun Jan 18 2009 Tomas Mraz <tmraz@redhat.com> 1.6.0.1-3
|
* Sun Jan 18 2009 Tomas Mraz <tmraz@redhat.com> 1.6.0.1-3
|
||||||
- disable the upstream openssl fips support
|
- disable the upstream openssl fips support
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue