packages: dos2unix/dos2unix-manpage-update.patch, dos2unix/dos2unix.spec, d...

[caleb]

Author: caleb                        Date: Fri Nov 12 16:06:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Up to 5.1.1
- Obsoletes separate unix2dos package
- Removed patches 0, 1, 4 and 5: applied upstream
- Commented patches 3 and 6: probably applied upstream but unclear due to significant changes in new version, do not apply cleanly
- Updated upstream project URLs

---- Files affected:
packages/dos2unix:
   dos2unix-manpage-update.patch (1.1 -> 1.2) , dos2unix.spec (1.22 -> 1.23) , dos2unix-preserve-file-modes.patch (1.1 -> NONE)  (REMOVED), dos2unix-safeconv.patch (1.1 -> NONE)  (REMOVED), dos2unix-segfault.patch (1.2 -> NONE)  (REMOVED), dos2unix.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/dos2unix/dos2unix-manpage-update.patch
diff -u packages/dos2unix/dos2unix-manpage-update.patch:1.1 packages/dos2unix/dos2unix-manpage-update.patch:1.2
--- packages/dos2unix/dos2unix-manpage-update.patch:1.1	Fri May 30 09:57:30 2008
+++ packages/dos2unix/dos2unix-manpage-update.patch	Fri Nov 12 17:06:05 2010
@@ -7,8 +7,8 @@
 Patch by Bill Anderson
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=57507
 
---- dos2unix-3.1/dos2unix.1
-+++ dos2unix-3.1/dos2unix.1
+--- dos2unix-5.1.1/man/man1/dos2unix.1~
++++ dos2unix-5.1.1/man/man1/dos2unix.1
 @@ -4,127 +4,104 @@
  .SH NAME
  

================================================================
Index: packages/dos2unix/dos2unix.spec
diff -u packages/dos2unix/dos2unix.spec:1.22 packages/dos2unix/dos2unix.spec:1.23
--- packages/dos2unix/dos2unix.spec:1.22	Fri May 30 10:18:14 2008
+++ packages/dos2unix/dos2unix.spec	Fri Nov 12 17:06:05 2010
@@ -7,19 +7,17 @@
 Summary(uk.UTF-8):	dos2unix - конвертор текстових файлів DOS в формат UNIX
 Summary(zh_CN.UTF-8):	转换DOS或MAC文本文件到UNIX格式
 Name:		dos2unix
-Version:	3.1
-Release:	21
+Version:	5.1.1
+Release:	1
 License:	Freer than LGPL
 Group:		Applications/Text
-Source0:	http://www.go.dlr.de/linux/src/%{name}-%{version}.tar.gz
-# Source0-md5:	25ff56bab202de63ea6f6c211c416e96
-Patch0:		%{name}.patch
-Patch1:		%{name}-segfault.patch
+Source0:	http://www.xs4all.nl/~waterlan/dos2unix/%{name}-%{version}.tar.gz
+# Source0-md5:	b8f6d8109fc6decf412bc1e3959450c0
+URL:		http://www.xs4all.nl/~waterlan/dos2unix.html
 Patch2:		%{name}-includes.patch
 Patch3:		%{name}-manpage-update.patch
-Patch4:		%{name}-preserve-file-modes.patch
-Patch5:		%{name}-safeconv.patch
 Patch6:		%{name}-workaround-rename-EXDEV.patch
+Obsoletes:	unix2dos
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -45,35 +43,32 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+#%patch3 -p1
+#%patch6 -p1
 
 %build
-%{__cc} %{rpmcflags} -o dos2unix dos2unix.c
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-install dos2unix $RPM_BUILD_ROOT%{_bindir}
-install dos2unix.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%find_lang %{name} --all-name
 
-ln -sf dos2unix $RPM_BUILD_ROOT%{_bindir}/mac2unix
-
-echo ".so dos2unix.1" > $RPM_BUILD_ROOT%{_mandir}/man1/mac2unix.1
+find $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc COPYRIGHT
-%attr(755,root,root) %{_bindir}/*
+%doc COPYING.txt ChangeLog.txt NEWS.txt README.txt TODO.txt
+%attr(755,root,root) %{_bindir}/dos2unix
+%attr(755,root,root) %{_bindir}/mac2unix
+%attr(755,root,root) %{_bindir}/unix2dos
+%attr(755,root,root) %{_bindir}/unix2mac
 %{_mandir}/man1/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -82,6 +77,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2010/11/12 16:06:05  caleb
+- Up to 5.1.1
+- Obsoletes separate unix2dos package
+- Removed patches 0, 1, 4 and 5: applied upstream
+- Commented patches 3 and 6: probably applied upstream but unclear due to significant changes in new version, do not apply cleanly
+- Updated upstream project URLs
+
 Revision 1.22  2008/05/30 08:18:14  arekm
 - rel 21
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dos2unix/dos2unix-manpage-update.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dos2unix/dos2unix.spec?r1=1.22&r2=1.23&f=u