From aebcf6422ef0e7d430f438c5c14a7c398f7a0afc56b7ec1204f474b666ed0387 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 15 Jan 2011 01:26:59 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/dos2unix revision 21.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/dos2unix?expand=0&rev=70949144ccb2681870863bda3638c11a --- dos2unix.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dos2unix.spec b/dos2unix.spec index 017de83..1766cf4 100644 --- a/dos2unix.spec +++ b/dos2unix.spec @@ -1,7 +1,7 @@ # -# spec file for package dos2unix (Version 5.1.1) +# spec file for package dos2unix # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: dos2unix BuildRequires: xz Summary: Text converters to and from DOS/MAC to UNIX Version: 5.1.1 -Release: 3 +Release: 4 Group: Productivity/Text/Convertors License: BSD3c Url: http://www.xs4all.nl/~waterlan/#DOS2UNIX From 3b536f4d989e6497b05b6567d0f4c036757d4d48d0a66ef89656611372083945 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Thu, 3 Feb 2011 17:56:34 +0000 Subject: [PATCH 2/3] - 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 OBS-URL: https://build.opensuse.org/package/show/Base:System/dos2unix?expand=0&rev=27 --- dos2unix-5.1.1.tar.xz | 3 --- dos2unix-5.2.tar.xz | 3 +++ dos2unix-correct_ending.patch | 22 ++++++++++++++++++++++ dos2unix.changes | 16 ++++++++++++++++ dos2unix.spec | 8 +++++--- 5 files changed, 46 insertions(+), 6 deletions(-) delete mode 100644 dos2unix-5.1.1.tar.xz create mode 100644 dos2unix-5.2.tar.xz create mode 100644 dos2unix-correct_ending.patch diff --git a/dos2unix-5.1.1.tar.xz b/dos2unix-5.1.1.tar.xz deleted file mode 100644 index c8a9f22..0000000 --- a/dos2unix-5.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad17baa702b429ba94c09c8bbb7cfdfed8a4bc5f467f32798498b6596bc38107 -size 48676 diff --git a/dos2unix-5.2.tar.xz b/dos2unix-5.2.tar.xz new file mode 100644 index 0000000..a6ffce8 --- /dev/null +++ b/dos2unix-5.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03ae3f10826dcfc3f40c577b12a5aa7c97e17cbed73f49ca5c0225b6e5bbd302 +size 34580 diff --git a/dos2unix-correct_ending.patch b/dos2unix-correct_ending.patch new file mode 100644 index 0000000..8474b6e --- /dev/null +++ b/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 diff --git a/dos2unix.changes b/dos2unix.changes index ec307c1..11fedc8 100644 --- a/dos2unix.changes +++ b/dos2unix.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +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 diff --git a/dos2unix.spec b/dos2unix.spec index 1766cf4..74e4951 100644 --- a/dos2unix.spec +++ b/dos2unix.spec @@ -18,14 +18,15 @@ Name: dos2unix -BuildRequires: xz +BuildRequires: xz ghostscript-library Summary: Text converters to and from DOS/MAC to UNIX -Version: 5.1.1 -Release: 4 +Version: 5.2 +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 Provides: unix2dos = %{version} Obsoletes: unix2dos < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,6 +40,7 @@ format to DOS format and unix2dos converts from UNIX to MAC format. %prep %setup -q +%patch0 find . -type f | xargs chmod -x %build From f5c4971962bf40fed62db44695b9b60f250f2ba939a6f275e08e0b659ca21f01 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Tue, 15 Feb 2011 16:51:35 +0000 Subject: [PATCH 3/3] - Don't generate ps/pdf documents, thus no need for ghostscript. OBS-URL: https://build.opensuse.org/package/show/Base:System/dos2unix?expand=0&rev=28 --- dos2unix-no_pdf.patch | 15 +++++++++++++++ dos2unix.changes | 5 +++++ dos2unix.spec | 4 +++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 dos2unix-no_pdf.patch diff --git a/dos2unix-no_pdf.patch b/dos2unix-no_pdf.patch new file mode 100644 index 0000000..d6c5950 --- /dev/null +++ b/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) diff --git a/dos2unix.changes b/dos2unix.changes index 11fedc8..173bda9 100644 --- a/dos2unix.changes +++ b/dos2unix.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/dos2unix.spec b/dos2unix.spec index 74e4951..70f7657 100644 --- a/dos2unix.spec +++ b/dos2unix.spec @@ -18,7 +18,7 @@ Name: dos2unix -BuildRequires: xz ghostscript-library +BuildRequires: xz Summary: Text converters to and from DOS/MAC to UNIX Version: 5.2 Release: 1 @@ -27,6 +27,7 @@ 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 @@ -41,6 +42,7 @@ format to DOS format and unix2dos converts from UNIX to MAC format. %prep %setup -q %patch0 +%patch1 find . -type f | xargs chmod -x %build