rpms/dos2unix/devel dos2unix-missing-proto.patch, NONE, 1.1 dos2unix.spec, 1.30, 1.31

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/dos2unix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv320

Modified Files:
	dos2unix.spec 
Added Files:
	dos2unix-missing-proto.patch 
Log Message:
* Mon Apr 14 2008 Tim Waugh <twaugh at redhat.com> 3.1-32
- Adjust license tag (bug #225706).
- Fix missing prototype (bug #225706).
- Install copy as symbolic links (bug #225706).


dos2unix-missing-proto.patch:

--- NEW FILE dos2unix-missing-proto.patch ---
diff -up dos2unix-3.1/dos2unix.c.missing-proto dos2unix-3.1/dos2unix.c
--- dos2unix-3.1/dos2unix.c.missing-proto	2008-04-14 17:11:58.000000000 +0100
+++ dos2unix-3.1/dos2unix.c	2008-04-14 17:12:42.000000000 +0100
@@ -75,6 +75,11 @@ static int macmode = 0;
 #include <string.h>
 #include <utime.h>
 #include <sys/stat.h>
+#if defined(__MSDOS__) || defined(__WIN32__) || defined(_WIN32)
+#  include <io.h>
+#else
+#  include <unistd.h>
+#endif
 #include "dos2unix.h"
 
 


Index: dos2unix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dos2unix/devel/dos2unix.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- dos2unix.spec	13 Feb 2008 10:56:13 -0000	1.30
+++ dos2unix.spec	14 Apr 2008 16:15:41 -0000	1.31
@@ -1,9 +1,9 @@
 Summary: Text file format converter
 Name: dos2unix
 Version: 3.1
-Release: 31%{?dist}
+Release: 32%{?dist}
 Group: Applications/Text
-License: Freely distributable
+License: BSD
 Source: %{name}-%{version}.tar.bz2
 Patch0: %{name}-%{version}.patch
 Patch1: dos2unix-3.1-segfault.patch
@@ -12,6 +12,7 @@
 Patch4: dos2unix-3.1-preserve-file-modes.patch
 Patch5: dos2unix-3.1-tmppath.patch
 Patch6: dos2unix-c-missing-arg.patch
+Patch7: dos2unix-missing-proto.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,6 +28,7 @@
 %patch4 -p1 -b .preserve-file-modes
 %patch5 -p1 -b .tmppath
 %patch6 -p1 -b .c-missing-arg
+%patch7 -p1 -b .missing-proto
 
 for I in *.[ch]; do
 	sed -e 's,#endif.*,#endif,g' -e 's,#else.*,#else,g' $I > $I.new
@@ -37,16 +39,15 @@
 make clean
 make CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE $(getconf LFS_CFLAGS)" \
   %{?_smp_mflags}
-make link
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
 install -p -m755 dos2unix $RPM_BUILD_ROOT%{_bindir}
-install -p -m755 mac2unix $RPM_BUILD_ROOT%{_bindir}
-install -p -m444 dos2unix.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m444 mac2unix.1 $RPM_BUILD_ROOT%{_mandir}/man1
+ln -s dos2unix $RPM_BUILD_ROOT%{_bindir}/mac2unix
+install -p -m644 dos2unix.1 $RPM_BUILD_ROOT%{_mandir}/man1
+ln -s dos2unix.1 $RPM_BUILD_ROOT%{_mandir}/man1/mac2unix.1
 
 %files
 %defattr(-,root,root,0755)
@@ -59,6 +60,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 14 2008 Tim Waugh <twaugh at redhat.com> 3.1-32
+- Adjust license tag (bug #225706).
+- Fix missing prototype (bug #225706).
+- Install copy as symbolic links (bug #225706).
+
 * Wed Feb 13 2008 Tim Waugh <twaugh at redhat.com> 3.1-31
 - Rebuild for GCC 4.3.