[dos2unix] Applied changes from Chen Lei (bug #592922).

[Tim Waugh]

commit 4d255bff494a2d130a71bc384fa6f176ce83339f
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Aug 18 11:40:15 2010 +0100

    Applied changes from Chen Lei (bug #592922).
    
    * Sun Aug 15 2010 Chen Lei <supercyper1 at gmail.com> 5.1-1
    - 5.1.
    - Update spec to match latest guidelines w.r.t buildroot tag

 .gitignore    |    1 +
 dos2unix.spec |   38 ++++++++++++++++++++++++++------------
 sources       |    2 +-
 3 files changed, 28 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 96cb577..ce70d8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 dos2unix-3.1.tar.bz2
 dos2unix-4.1.1.tar.gz
 dos2unix-4.1.2.tar.gz
+/dos2unix-5.1.tar.gz
diff --git a/dos2unix.spec b/dos2unix.spec
index caea80d..fa2a2f6 100644
--- a/dos2unix.spec
+++ b/dos2unix.spec
@@ -1,42 +1,56 @@
-Summary: Text file format converter
+Summary: Text file format converters
 Name: dos2unix
-Version: 4.1.2
+Version: 5.1
 Release: 1%{?dist}
 Group: Applications/Text
 License: BSD
-
-Url: http://www.xs4all.nl/~waterlan/dos2unix.html
+URL: http://www.xs4all.nl/~waterlan/dos2unix.html
 Source: http://www.xs4all.nl/~waterlan/dos2unix/%{name}-%{version}.tar.gz
-
 BuildRequires: gettext
-
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Provides: unix2dos = %{version}-%{release}
+Obsoletes: unix2dos < 5.1-1
 
 %description
-Dos2unix converts DOS or MAC text files to UNIX format.
+Convert text files with DOS or Mac line endings to Unix line endings and 
+vice versa.
 
 %prep
 %setup -q
+rm -rf po/*/eo-x.*
+find -type f -exec chmod 0644 {} ";"
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE $(getconf LFS_CFLAGS)" \
   %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install
-%find_lang %{name}
+make DESTDIR=$RPM_BUILD_ROOT install
+
+# We add doc files manually to %%doc
+rm -rf $RPM_BUILD_ROOT%{_docdir}
+
+%find_lang %{name} --all-name
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc COPYING.txt
+%doc dos2unix.html  ChangeLog.txt COPYING.txt
+%doc NEWS.txt README.txt TODO.txt
 %{_bindir}/dos2unix
 %{_bindir}/mac2unix
-%{_mandir}/*/*
+%{_bindir}/unix2dos
+%{_bindir}/unix2mac
+%{_mandir}/man1/*.1*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Aug 18 2010 Tim Waugh <twaugh at redhat.com> 5.1-1
+- Applied changes from Chen Lei (bug #592922):
+  * Sun Aug 15 2010 Chen Lei <supercyper1 at gmail.com> 5.1-1
+  - 5.1.
+  - Update spec to match latest guidelines w.r.t buildroot tag
+
 * Tue Jan 26 2010 Tim Waugh <twaugh at redhat.com> 4.1.2-1
 - 4.1.2.
 
diff --git a/sources b/sources
index 74c9614..4133e87 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2849bf7b8ec51884e61d12ec98cb1b16  dos2unix-4.1.2.tar.gz
+38fbcb4bcbd73e94c3bdf7b5bdf95f78  dos2unix-5.1.tar.gz