Accepting request 109036 from home:tabraham1:branches:Base:System

update to 5.3.3

OBS-URL: https://build.opensuse.org/request/show/109036
OBS-URL: https://build.opensuse.org/package/show/Base:System/dos2unix?expand=0&rev=46
This commit is contained in:
Andreas Jaeger 2012-03-13 10:18:25 +00:00 committed by Git OBS Bridge
parent 9fc998ca9b
commit 88b23c4a1e
5 changed files with 16 additions and 29 deletions

View File

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

3
dos2unix-5.3.3.tar.gz Normal file
View File

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

View File

@ -1,22 +0,0 @@
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
+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)
@@ -279,7 +279,7 @@ $(POT) : dos2unix.c unix2dos.c common.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

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Mar 12 18:25:19 UTC 2012 - tabraham@novell.com
- Update to 5.3.3:
- enabled wildcard expansion
- small update in RETURN VALUE section of man page
- removed dos2unix-correct_ending.patch (instead pass HTMLEXT="html"
to make)
-------------------------------------------------------------------
Mon Jan 30 13:05:59 CET 2012 - pth@suse.de

View File

@ -16,15 +16,15 @@
#
Name: dos2unix
Summary: Text converters to and from DOS/MAC to UNIX
License: BSD-3-Clause
Group: Productivity/Text/Convertors
Version: 5.3.2
Version: 5.3.3
Release: 0
Url: http://waterlan.home.xs4all.nl/dos2unix.html
Source: %{name}-%{version}.tar.gz
Patch0: dos2unix-correct_ending.patch
Provides: unix2dos = %{version}
Obsoletes: unix2dos < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -39,12 +39,11 @@ format to DOS format and unix2dos converts from UNIX to MAC format.
%prep
%setup -q
%patch0
find . -type f | xargs chmod -x
%build
export RPM_OPT_FLAGS
make %{?_smp_mflags} CC="%{__cc}"
make %{?_smp_mflags} CC="%{__cc}" HTMLEXT="html"
%install
%makeinstall docdir=%{_defaultdocdir}/%{name}