Accepting request 61348 from Base:System

Accepted submit request 61348 from user psmt

OBS-URL: https://build.opensuse.org/request/show/61348
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dos2unix?expand=0&rev=23

dos2unix-5.1.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad17baa702b429ba94c09c8bbb7cfdfed8a4bc5f467f32798498b6596bc38107
-size 48676

dos2unix-5.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:03ae3f10826dcfc3f40c577b12a5aa7c97e17cbed73f49ca5c0225b6e5bbd302
+size 34580

dos2unix-correct_ending.patch

@@ -0,0 +1,22 @@
+Index: Makefile
+===================================================================
+--- Makefile.orig	2011-01-31 22:06:08.000000000 +0100
++++ Makefile	2011-02-03 18:45:16.548761128 +0100
+@@ -77,7 +77,7 @@ ifdef ENABLE_NLS
+ 	MOFILES			= $(DOS2UNIX_MOFILES) $(UNIX2DOS_MOFILES)
+ endif
+ 
+-DOCFILES	= $(PACKAGE).txt $(PACKAGE).ps $(PACKAGE).pdf $(PACKAGE).htm
++DOCFILES	= $(PACKAGE).txt $(PACKAGE).ps $(PACKAGE).pdf $(PACKAGE).html
+ INSTALL_OBJS_DOC = README.txt NEWS.txt ChangeLog.txt COPYING.txt TODO.txt BUGS.txt $(DOCFILES)
+ 
+ #PODFILES	= man/man1/dos2unix.pod $(wildcard man/*/man1/dos2unix.pod)
+@@ -249,7 +249,7 @@ $(UNIX2DOS_POT) : unix2dos.c
+ %.pdf: %.ps
+ 	ps2pdf $< $@
+ 
+-%.htm : man/man1/%.pod
++%.html : man/man1/%.pod
+ 	pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - DOS/MAC to UNIX and vice versa text file format converter" $< > $@
+ 
+ install: all

dos2unix-no_pdf.patch

@@ -0,0 +1,15 @@
+We don't need either ps nor pdf.
+
+Index: Makefile
+===================================================================
+--- Makefile.orig	2011-02-15 17:44:49.000000000 +0100
++++ Makefile	2011-02-15 17:47:59.872343582 +0100
+@@ -77,7 +77,7 @@ ifdef ENABLE_NLS
+ 	MOFILES			= $(DOS2UNIX_MOFILES) $(UNIX2DOS_MOFILES)
+ endif
+ 
+-DOCFILES	= $(PACKAGE).txt $(PACKAGE).ps $(PACKAGE).pdf $(PACKAGE).html
++DOCFILES	= $(PACKAGE).txt $(PACKAGE).html
+ INSTALL_OBJS_DOC = README.txt NEWS.txt ChangeLog.txt COPYING.txt TODO.txt BUGS.txt $(DOCFILES)
+ 
+ #PODFILES	= man/man1/dos2unix.pod $(wildcard man/*/man1/dos2unix.pod)

dos2unix.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Feb 15 17:50:05 CET 2011 - pth@suse.de
+
+- Don't generate ps/pdf documents, thus no need for ghostscript.
+
+-------------------------------------------------------------------
+Thu Feb  3 18:03:40 CET 2011 - pth@suse.de
+
+- Update to 5.2:
+    ISO conversion mode supports same DOS code pages as SunOS dos2unix does:
+      CP437 (US), CP850 (Western European), CP860 (Portuguese),
+      CP863 (French Canadian), and CP865 (Nordic). 
+    ISO conversion mode supports Windows code page CP1252 (Western).
+    SunOS compatible options -ascii, -iso, -7, -437, -850, -860, -863, and -865.
+    Active code page detection for ISO mode.
+    Fixed ISO conversion of non-breaking space (NBSP).
+    Treat ASCII Form Feed control characters as valid text.
+    Update manual pages.
+    Don't include generated documentation files in Unix source package.
+- Suffix for HTML pages is .html not .htm
+
 -------------------------------------------------------------------
 Fri Jan 14 20:08:59 UTC 2011 - coolo@novell.com
 

dos2unix.spec

@@ -20,12 +20,14 @@
 Name:           dos2unix
 BuildRequires:  xz
 Summary:        Text converters to and from DOS/MAC to UNIX
-Version:        5.1.1
+Version:        5.2
-Release:        4
+Release:        1
 Group:          Productivity/Text/Convertors
 License:        BSD3c
 Url:            http://www.xs4all.nl/~waterlan/#DOS2UNIX
 Source:         %{name}-%{version}.tar.xz
+Patch0:         dos2unix-correct_ending.patch
+Patch1:         dos2unix-no_pdf.patch
 Provides:       unix2dos = %{version}
 Obsoletes:      unix2dos < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -39,6 +41,8 @@ format to DOS format and unix2dos converts from UNIX to MAC format.
 
 %prep
 %setup -q
+%patch0
+%patch1
 find . -type f | xargs chmod -x
 
 %build