From 928bfe5e486c31be6ebb067827d396e792904932c81c58a2199c4a0a05fe40d3 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 26 May 2011 08:16:38 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/dos2unix revision 27.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/dos2unix?expand=0&rev=f1a121b856880816c88fbd56ec379b54 --- dos2unix.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dos2unix.spec b/dos2unix.spec index 074aeff..6709c12 100644 --- a/dos2unix.spec +++ b/dos2unix.spec @@ -20,7 +20,7 @@ Name: dos2unix Summary: Text converters to and from DOS/MAC to UNIX Version: 5.3 -Release: 1 +Release: 3 Group: Productivity/Text/Convertors License: BSD3c Url: http://www.xs4all.nl/~waterlan/#DOS2UNIX From ddfde875625c2226214468c6597c6bbb28bd513792640cb192b85d1e1f84be15 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Wed, 10 Aug 2011 10:48:00 +0000 Subject: [PATCH 2/2] - 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. OBS-URL: https://build.opensuse.org/package/show/Base:System/dos2unix?expand=0&rev=37 --- dos2unix-5.3.1.tar.xz | 3 +++ dos2unix-5.3.tar.xz | 3 --- dos2unix-cloexec.patch | 37 ----------------------------------- dos2unix-correct_ending.patch | 14 ++++++------- dos2unix.changes | 9 +++++++++ dos2unix.spec | 8 +++----- 6 files changed, 22 insertions(+), 52 deletions(-) create mode 100644 dos2unix-5.3.1.tar.xz delete mode 100644 dos2unix-5.3.tar.xz delete mode 100644 dos2unix-cloexec.patch diff --git a/dos2unix-5.3.1.tar.xz b/dos2unix-5.3.1.tar.xz new file mode 100644 index 0000000..d6de146 --- /dev/null +++ b/dos2unix-5.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3528c6b07f68cb057c8af94a0eac488ba7a1ebaa10f94ec00eb68cc79cfa6df0 +size 40660 diff --git a/dos2unix-5.3.tar.xz b/dos2unix-5.3.tar.xz deleted file mode 100644 index baece86..0000000 --- a/dos2unix-5.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fccd8c77a848e8090e00a096f2cf74752d6bb556a8a94a2b64eb2c10410ad8e9 -size 39916 diff --git a/dos2unix-cloexec.patch b/dos2unix-cloexec.patch deleted file mode 100644 index c84f5f4..0000000 --- a/dos2unix-cloexec.patch +++ /dev/null @@ -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) diff --git a/dos2unix-correct_ending.patch b/dos2unix-correct_ending.patch index 64937ac..002f18c 100644 --- a/dos2unix-correct_ending.patch +++ b/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 diff --git a/dos2unix.changes b/dos2unix.changes index 40d605d..8583d82 100644 --- a/dos2unix.changes +++ b/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 diff --git a/dos2unix.spec b/dos2unix.spec index 6709c12..bd3513c 100644 --- a/dos2unix.spec +++ b/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