Accepting request 78440 from Base:System

Update to 5.3.1

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

dos2unix-5.3.1.tar.xz

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

dos2unix-5.3.tar.xz

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

dos2unix-cloexec.patch

@@ -1,37 +0,0 @@
---- dos2unix.c.orig
-+++ dos2unix.c
-@@ -158,8 +158,8 @@
-   #define R_CNTRL   "rb"
-   #define W_CNTRL   "wb"
- #else
--  #define R_CNTRL   "r"
--  #define W_CNTRL   "w"
-+  #define R_CNTRL   "re"
-+  #define W_CNTRL   "we"
- #endif
- 
- #define BINARY_FILE 0x1
---- unix2dos.c.orig
-+++ unix2dos.c
-@@ -148,8 +148,8 @@
-   #define R_CNTRL   "rb"
-   #define W_CNTRL   "wb"
- #else
--  #define R_CNTRL   "r"
--  #define W_CNTRL   "w"
-+  #define R_CNTRL   "re"
-+  #define W_CNTRL   "we"
- #endif
- 
- #define BINARY_FILE 0x1
---- Makefile.orig
-+++ Makefile
-@@ -198,7 +198,7 @@ endif
- 
- CFLAGS	= -O2 -Wall $(RPM_OPT_FLAGS)
- 
--EXTRA_CFLAGS	= -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
-+EXTRA_CFLAGS	= -D_GNU_SOURCE -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
- 		  -DVER_DATE=\"$(DOS2UNIX_DATE)\" \
- 		  -DDEBUG=$(DEBUG) \
- 		  $(CFLAGS_OS)

dos2unix-correct_ending.patch

@@ -1,8 +1,9 @@
-diff -rupN dos2unix-5.3.orig//Makefile dos2unix-5.3//Makefile
---- dos2unix-5.3.orig//Makefile	2011-05-21 19:34:56.217828000 +0300
-+++ dos2unix-5.3//Makefile	2011-05-21 19:39:38.670827981 +0300
-@@ -94,7 +94,7 @@ ifdef ENABLE_NLS
- 	MOFILES			= $(DOS2UNIX_MOFILES) $(UNIX2DOS_MOFILES)
+Index: Makefile
+===================================================================
+--- Makefile.orig	2011-08-08 22:27:20.000000000 +0200
++++ Makefile	2011-08-10 12:42:45.756865674 +0200
+@@ -89,7 +89,7 @@ ifdef ENABLE_NLS
+ 	EOX_POFILES	= po/eo-x.po
  endif
  
 -DOCFILES	= $(PACKAGE).txt $(PACKAGE).htm
@@ -10,7 +11,7 @@ diff -rupN dos2unix-5.3.orig//Makefile dos2unix-5.3//Makefile
  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)
-@@ -293,7 +293,7 @@ $(UNIX2DOS_POT) : unix2dos.c
+@@ -279,7 +279,7 @@ $(POT) : dos2unix.c unix2dos.c common.c
  %.pdf: %.ps
  	ps2pdf $< $@
  
@@ -19,4 +20,3 @@ diff -rupN dos2unix-5.3.orig//Makefile dos2unix-5.3//Makefile
  	pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - DOS/MAC to UNIX and vice versa text file format converter" $< > $@
  
  install: all
-Binary files dos2unix-5.3.orig//.Makefile.swp and dos2unix-5.3//.Makefile.swp differ

dos2unix.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Aug 10 12:46:41 CEST 2011 - pth@suse.de
+
+- Update to 5.3.1:
+  * Spanish tranlation of messages and manual.
+  * File ownership is maintained in old file mode (Unix only).
+  * Dos2unix and Unix2dos share the same language files.
+  * Code cleanup.
+
 -------------------------------------------------------------------
 Wed May 25 07:01:35 UTC 2011 - aj@suse.de
 

dos2unix.spec

@@ -19,14 +19,13 @@
 
 Name:           dos2unix
 Summary:        Text converters to and from DOS/MAC to UNIX
-Version:        5.3
-Release:        3
+Version:        5.3.1
+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-cloexec.patch
 Provides:       unix2dos = %{version}
 Obsoletes:      unix2dos < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -41,8 +40,7 @@ format to DOS format and unix2dos converts from UNIX to MAC format.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1
+%patch0
 find . -type f | xargs chmod -x
 
 %build