Accepting request 34030 from Base:System

checked in (request 34030)

OBS-URL: https://build.opensuse.org/request/show/34030
OBS-URL: https://build.opensuse.org/package/show/Base:System/dos2unix?expand=0&rev=13

dos2unix.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package dos2unix (Version 4.0)
+# spec file for package dos2unix (Version 4.1.2)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -18,29 +18,32 @@
 
 
 Name:           dos2unix
-Summary:        Text converters to and from DOS/MAC to UNIX
-Version:        5.0
+Summary:        A DOS to UNIX Text Converter
+Version:        4.1.2
 Release:        1
 Group:          Productivity/Text/Convertors
 License:        BSD3c
 Url:            http://www.xs4all.nl/~waterlan/#DOS2UNIX
 Source:         %{name}-%{version}.tar.bz2
-Source1:        dos2unix-de.po.bz2
-Provides:       unix2dos = %{version}
-Obsoletes:      unix2dos < %{version}
+Source1:        de.po
+Patch0:         dos2unix-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-Dos2unix is used to convert plain text from DOS (CR/LF) format. Mac2unix
-converts plain text from MAC (CR) format to UNIX format (LF).
+dos2unix is used to convert plain text from DOS (CR/LF) format to UNIX
+format (LF).
 
-Unix2dos converts plain text files from UNIX
-format to DOS format and unix2dos converts from UNIX to MAC format.
+
+
+Authors:
+--------
+    Benjamin Lin blin @ socs.uts.edu.au
+    Erwin Waterlander <waterlan @ xs4all.nl>
 
 %prep
 %setup -q
-bzcat %{S:1} > po/dos2unix/de.po
-
+%patch0
+cp %{S:1} po/
 find . -type f -exec chmod -x {} \;
 
 %build
@@ -48,16 +51,14 @@ export RPM_OPT_FLAGS
 make %{?jobs:-j%jobs}
 
 %install
-%makeinstall docdir=%{_defaultdocdir}/%{name}
-%{find_lang} dos2unix --all-name --with-man
+%makeinstall
+%{find_lang} %{name}
 
-%files -f dos2unix.lang
+%files -f %{name}.lang
 %defattr(-,root,root,0755)
 %doc %{_defaultdocdir}/%{name}
 %{_bindir}/dos2unix
 %{_bindir}/mac2unix
-%{_bindir}/unix2mac
-%{_bindir}/unix2dos
 %{_mandir}/*/*
 
 %clean