diff --git a/dos2unix.spec b/dos2unix.spec index 11c4a20..76998b0 100644 --- a/dos2unix.spec +++ b/dos2unix.spec @@ -1,7 +1,7 @@ Summary: Text file format converter Name: dos2unix Version: 3.1 -Release: 12 +Release: 15 Group: Applications/Text License: Freely distributable Source: %{name}-%{version}.tar.bz2 @@ -16,7 +16,10 @@ Dos2unix converts DOS or MAC text files to UNIX format. %setup -q %patch0 -p1 -b .orig %patch1 -p1 -b .segf -perl -pi -e 's,(#endif|#else)[^ ]*(.*),$1 /* $2 */,g' *.[ch] +for I in *.[ch]; do + sed -e 's,#endif.*,#endif,g' -e 's,#else.*,#else,g' $I > $I.new + mv -f $I.new $I +done %build make clean @@ -43,6 +46,17 @@ install -m444 mac2unix.1 $RPM_BUILD_ROOT%{_mandir}/man1 rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 05 2003 Elliot Lee 3.1-15 +- Remove build dependency on perl, since perl BuildRequires: dos2unix, + and there's no good reason not to just use sed here. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Oct 7 2002 Mike A. Harris 3.1-13 +- All-arch rebuild +- Added BuildRequires: perl + * Fri Jun 21 2002 Tim Powers - automated rebuild