From a092341f3f1ace13755e1ba3a7c925dd46714fb15282b28397f5d824581b0e6b Mon Sep 17 00:00:00 2001
From: Erwin Waterlander <waterlan@xs4all.nl>
Date: Sun, 26 Oct 2014 14:36:30 +0000
Subject: [PATCH] - Fixed license type: BSD-2-Clause - Added missing manual
 translations: da, fr, pt_BR. - Update to 7.1:   * New: Option -i, --info to
 print file information.     This new option prints number of DOS, Unix, and
 Mac line breaks, the byte     order mark, and if the file is text or binary.
 And it can print the names     of files that would be converted.   Version
 7.0   * New: automated self-tests.   * New: option -u to keep UTF-16
 encoding.   * New: option -v to print information about BOMs and converted
 line breaks.   * Change: stdio mode does not automatically set quiet mode.  
 * Change: stdio mode does not automatically force conversion of binaries.    
 An error is returned when the stdin stream contains a binary symbol.   *
 Bugfix: dos2unix -l created DOS line breaks from Mac line breaks.   * Bugfix:
 system error number was not always returned.   * Bugfix: an Unicode input
 file disabled 7bit and iso mode for next input files.   * Bugfix: mac2unix
 help text, options -b and -r.   * The code has been cleaned up.

OBS-URL: https://build.opensuse.org/package/show/Base:System/dos2unix?expand=0&rev=60
---
 dos2unix-6.0.6.tar.gz |  3 ---
 dos2unix-7.1.tar.gz   |  3 +++
 dos2unix.changes      | 23 +++++++++++++++++++++++
 dos2unix.spec         | 13 ++++++++-----
 4 files changed, 34 insertions(+), 8 deletions(-)
 delete mode 100644 dos2unix-6.0.6.tar.gz
 create mode 100644 dos2unix-7.1.tar.gz

diff --git a/dos2unix-6.0.6.tar.gz b/dos2unix-6.0.6.tar.gz
deleted file mode 100644
index f4cc87c..0000000
--- a/dos2unix-6.0.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8abbd4e9a630ef649f5ff359df10786c50b302c1b6515cf99bd787adea23d276
-size 339149
diff --git a/dos2unix-7.1.tar.gz b/dos2unix-7.1.tar.gz
new file mode 100644
index 0000000..f67f44c
--- /dev/null
+++ b/dos2unix-7.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46f93e792f7dfde06e9d8f347099eb4c4db2167b728fafcafb5ca6b5503740c5
+size 382427
diff --git a/dos2unix.changes b/dos2unix.changes
index dc2e862..ce4a142 100644
--- a/dos2unix.changes
+++ b/dos2unix.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Sun Oct 26 14:31:04 UTC 2014 - waterlan@xs4all.nl
+
+- Fixed license type: BSD-2-Clause
+- Added missing manual translations: da, fr, pt_BR.
+- Update to 7.1:
+  * New: Option -i, --info to print file information.
+    This new option prints number of DOS, Unix, and Mac line breaks, the byte
+    order mark, and if the file is text or binary. And it can print the names
+    of files that would be converted.
+  Version 7.0
+  * New: automated self-tests.
+  * New: option -u to keep UTF-16 encoding.
+  * New: option -v to print information about BOMs and converted line breaks.
+  * Change: stdio mode does not automatically set quiet mode.
+  * Change: stdio mode does not automatically force conversion of binaries.
+    An error is returned when the stdin stream contains a binary symbol.
+  * Bugfix: dos2unix -l created DOS line breaks from Mac line breaks.
+  * Bugfix: system error number was not always returned.
+  * Bugfix: an Unicode input file disabled 7bit and iso mode for next input files.
+  * Bugfix: mac2unix help text, options -b and -r.
+  * The code has been cleaned up.
+
 -------------------------------------------------------------------
 Mon Aug  4 15:31:58 CEST 2014 - pth@suse.de
 
diff --git a/dos2unix.spec b/dos2unix.spec
index 515f996..39a45e2 100644
--- a/dos2unix.spec
+++ b/dos2unix.spec
@@ -18,9 +18,9 @@
 
 Name:           dos2unix
 Summary:        Text converters to and from DOS/MAC to UNIX
-License:        BSD-3-Clause
+License:        BSD-2-Clause
 Group:          Productivity/Text/Convertors
-Version:        6.0.6
+Version:        7.1
 Release:        0
 Url:            http://waterlan.home.xs4all.nl/dos2unix.html
 Source:         http://waterlan.home.xs4all.nl/dos2unix/dos2unix-%{version}.tar.gz
@@ -44,7 +44,7 @@ export RPM_OPT_FLAGS
 make %{?_smp_mflags} CC="%{__cc}" HTMLEXT="html"
 
 %install
-%makeinstall docdir=%{_defaultdocdir}/%{name}
+%makeinstall docdir=%{_defaultdocdir}/%{name} HTMLEXT="html"
 %{find_lang} dos2unix --all-name --with-man
 
 %files -f dos2unix.lang
@@ -58,9 +58,12 @@ make %{?_smp_mflags} CC="%{__cc}" HTMLEXT="html"
 %doc %{_mandir}/*/mac2unix.1*
 %doc %{_mandir}/*/unix2mac.1*
 %doc %{_mandir}/*/unix2dos.1*
-%doc %lang(nl) %dir %_mandir/nl
+%doc %lang(de) %dir %_mandir/de
 %doc %lang(es) %dir %_mandir/es
-%doc %lang(uk) %dir %_mandir/uk
+%doc %lang(fr) %dir %_mandir/fr
+%doc %lang(nl) %dir %_mandir/nl
 %doc %lang(pl) %dir %_mandir/pl
+%doc %lang(pt_BR) %dir %_mandir/pt_BR
+%doc %lang(uk) %dir %_mandir/uk
 
 %changelog