- upated to version from RH (release 13),

- merge translations from TurboLinux, KSI and Conectiva.

Changed files:
    dos2unix.spec -> 1.8

diff --git a/dos2unix.spec b/dos2unix.spec
index 9d8312df8b1373a92575153549732d7d92c94081..fdafaed0338a652fc9303e03b59e409751fc84bc 100644 (file)
--- a/dos2unix.spec
+++ b/dos2unix.spec
@@ -1,50 +1,65 @@
 Summary:       dos2unix - DOS/MAC to UNIX text file format converter
+Summary(fr):   Convertisseur de format de fichier texte
 Summary(pl):   dos2unix - konwerter plików tekstowych z formatu DOS/MAC na UNIX
+Summary(pt_BR):        Conversor de formatos de arquivos texto
+Summary(ru):   dos2unix - ËÏÎ×ÅÒÔÏÒ ÔÅËÓÔÏ×ÙÈ ÆÁÊÌÏ× DOS × ÆÏÒÍÁÔ UNIX
+Summary(uk):   dos2unix - ËÏÎ×ÅÒÔÏÒ ÔÅËÓÔÏ×ÉÈ ÆÁÊÌ¦× DOS × ÆÏÒÍÁÔ UNIX
+Summary(zh_CN):        ת»»DOS»òMACÎı¾Îļþµ½UNIX¸ñʽ
 Name:          dos2unix
-Version:       3.0
-Release:       2
+Version:       3.1
+Release:       13
 License:       Freer than LGPL
 Group:         Applications/Text
-Source0:       ftp://sunsite.unc.edu//pub/Linux/utils/text/%{name}-%{version}.src.tar.gz
-Source1:       ftp://sunsite.unc.edu//pub/Linux/utils/text/unix2dos-2.2.src.tar.gz
-Obsoletes:     unix2dos
+Source0:       ftp://sunsite.unc.edu//pub/Linux/utils/text/%{name}-%{version}.tar.bz2
+Patch0:                %{name}.patch
+Patch1:                %{name}-segfault.patch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 A utility that converts plain text files in DOS/MAC format to UNIX
 format and back.
 
+%description -l fr
+Dos2unix converti des fichier texte DOS ou MAC au format UNIX.
+
 %description -l pl
 Zestaw narzêdzi do konwersji pliki tekstowych w formacie DOS/MAC na
 u¿ywany poprzez UNIXa oraz odwrotnie.
 
+%description -l pt_BR
+O dos2unix converte arquivos texto do DOS e MAC para o formato texto
+do Unix.
+
+%description -l ru
+dos2unix - ËÏÎ×ÅÒÔÏÒ ÔÅËÓÔÏ×ÙÈ ÆÁÊÌÏ× DOS × ÆÏÒÍÁÔ UNIX.
+
+%description -l uk
+dos2unix - ËÏÎ×ÅÒÔÏÒ ÔÅËÓÔÏ×ÉÈ ÆÁÊÌ¦× DOS × ÆÏÒÍÁÔ UNIX.
+
 %prep
-%setup -q -c -a1
+%setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__cc} %{rpmcflags} -o dos2unix dos2unix.c
-%{__cc} %{rpmcflags} -o unix2dos unix2dos.c
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
 
-install -m 755 dos2unix $RPM_BUILD_ROOT%{_bindir}
-install -m 755 unix2dos $RPM_BUILD_ROOT%{_bindir}
+install dos2unix $RPM_BUILD_ROOT%{_bindir}
 install dos2unix.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install unix2dos.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 ln -sf dos2unix $RPM_BUILD_ROOT%{_bindir}/mac2unix
 
 echo ".so dos2unix.1" > $RPM_BUILD_ROOT%{_mandir}/man1/mac2unix.1
 
-gzip -9nf COPYRIGHT
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYRIGHT.gz
-%attr(755, root, root) %{_bindir}/*
+%doc COPYRIGHT
+%attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*