6.0.5 (bug #1089931).

Resolves: rhbz#1089931
2014-04-22 10:33:42 +01:00 · 2014-04-22 10:33:42 +01:00 · 03f49b4fe0
commit 03f49b4fe0
parent af87869565
4 changed files with 6 additions and 32 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,3 +10,4 @@ dos2unix-5.1.1.tar.gz
 /dos2unix-6.0.2.tar.gz
 /dos2unix-6.0.3.tar.gz
 /dos2unix-6.0.4.tar.gz
+/dos2unix-6.0.5.tar.gz
--- a/dos2unix-pod-encoding.patch
+++ b/dos2unix-pod-encoding.patch
@ -1,28 +0,0 @@
-diff -c -r dos2unix-6.0.4.orig/man/es/man1/dos2unix.pod dos2unix-6.0.4/man/es/man1/dos2unix.pod
-*** dos2unix-6.0.4.orig/man/es/man1/dos2unix.pod	2013-07-27 20:08:12.000000000 +0200
--- dos2unix-6.0.4/man/es/man1/dos2unix.pod	2014-01-02 14:19:52.944130621 +0100
-***************
-*** 50,55 ****
--- 50,57 ----
-  
-  =pod
-  
-+ =encoding latin1
-+ 
-  =head1 NOMBRE
-  
-  dos2unix - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa
-diff -c -r dos2unix-6.0.4.orig/man/nl/man1/dos2unix.pod dos2unix-6.0.4/man/nl/man1/dos2unix.pod
-*** dos2unix-6.0.4.orig/man/nl/man1/dos2unix.pod	2013-07-27 20:08:12.000000000 +0200
--- dos2unix-6.0.4/man/nl/man1/dos2unix.pod	2014-01-02 14:19:36.510059975 +0100
-***************
-*** 46,51 ****
--- 46,53 ----
-  */
-  =pod
-  
-+ =encoding latin1
-+ 
-  =head1 NAAM
-  
-  dos2unix - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter
--- a/dos2unix.spec
+++ b/dos2unix.spec
@ -1,12 +1,11 @@
 Summary: Text file format converters
 Name: dos2unix
-Version: 6.0.4
+Version: 6.0.5
 Release: 1%{?dist}
 Group: Applications/Text
 License: BSD
 URL: http://waterlan.home.xs4all.nl/dos2unix.html
 Source: http://waterlan.home.xs4all.nl/dos2unix/%{name}-%{version}.tar.gz
-Patch0: dos2unix-pod-encoding.patch
 BuildRequires: gettext
 BuildRequires: perl-Pod-Checker
 Provides: unix2dos = %{version}-%{release}
@ -18,7 +17,6 @@ vice versa.

 %prep
 %setup -q
-%patch0 -p1 -b .pod-encoding

 %build
 make %{?_smp_mflags}
@ -45,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
 rm -rf $RPM_BUILD_ROOT

 %changelog
+* Tue Apr 22 2014 Tim Waugh <twaugh@redhat.com> 6.0.5-1
+- 6.0.5 (bug #1089931).
+
 * Thu Jan  2 2014 Tim Waugh <twaugh@redhat.com> 6.0.4-1
 - 6.0.4.

--- a/2
+++ b/2
@ -1 +1 @@
-f1fff9d70f9ba644c038677ba1d94ac0  dos2unix-6.0.4.tar.gz
+e5b06dae8c11b6818fff9cf707b6490f  dos2unix-6.0.5.tar.gz