Applied changes from Chen Lei (bug #592922).

* Sun Aug 15 2010 Chen Lei <supercyper1@gmail.com> 5.1-1
- 5.1.
- Update spec to match latest guidelines w.r.t buildroot tag
This commit is contained in:
Tim Waugh 2010-08-18 11:40:15 +01:00
parent 0374f03fe4
commit 4d255bff49
3 changed files with 28 additions and 13 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
dos2unix-3.1.tar.bz2 dos2unix-3.1.tar.bz2
dos2unix-4.1.1.tar.gz dos2unix-4.1.1.tar.gz
dos2unix-4.1.2.tar.gz dos2unix-4.1.2.tar.gz
/dos2unix-5.1.tar.gz

View File

@ -1,42 +1,56 @@
Summary: Text file format converter Summary: Text file format converters
Name: dos2unix Name: dos2unix
Version: 4.1.2 Version: 5.1
Release: 1%{?dist} Release: 1%{?dist}
Group: Applications/Text Group: Applications/Text
License: BSD License: BSD
URL: http://www.xs4all.nl/~waterlan/dos2unix.html
Url: http://www.xs4all.nl/~waterlan/dos2unix.html
Source: http://www.xs4all.nl/~waterlan/dos2unix/%{name}-%{version}.tar.gz Source: http://www.xs4all.nl/~waterlan/dos2unix/%{name}-%{version}.tar.gz
BuildRequires: gettext BuildRequires: gettext
Provides: unix2dos = %{version}-%{release}
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: unix2dos < 5.1-1
%description %description
Dos2unix converts DOS or MAC text files to UNIX format. Convert text files with DOS or Mac line endings to Unix line endings and
vice versa.
%prep %prep
%setup -q %setup -q
rm -rf po/*/eo-x.*
find -type f -exec chmod 0644 {} ";"
%build %build
make CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE $(getconf LFS_CFLAGS)" \ make CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE $(getconf LFS_CFLAGS)" \
%{?_smp_mflags} %{?_smp_mflags}
%install %install
make DESTDIR=%{buildroot} install make DESTDIR=$RPM_BUILD_ROOT install
%find_lang %{name}
# We add doc files manually to %%doc
rm -rf $RPM_BUILD_ROOT%{_docdir}
%find_lang %{name} --all-name
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root,0755) %defattr(-,root,root,0755)
%doc COPYING.txt %doc dos2unix.html ChangeLog.txt COPYING.txt
%doc NEWS.txt README.txt TODO.txt
%{_bindir}/dos2unix %{_bindir}/dos2unix
%{_bindir}/mac2unix %{_bindir}/mac2unix
%{_mandir}/*/* %{_bindir}/unix2dos
%{_bindir}/unix2mac
%{_mandir}/man1/*.1*
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Aug 18 2010 Tim Waugh <twaugh@redhat.com> 5.1-1
- Applied changes from Chen Lei (bug #592922):
* Sun Aug 15 2010 Chen Lei <supercyper1@gmail.com> 5.1-1
- 5.1.
- Update spec to match latest guidelines w.r.t buildroot tag
* Tue Jan 26 2010 Tim Waugh <twaugh@redhat.com> 4.1.2-1 * Tue Jan 26 2010 Tim Waugh <twaugh@redhat.com> 4.1.2-1
- 4.1.2. - 4.1.2.

View File

@ -1 +1 @@
2849bf7b8ec51884e61d12ec98cb1b16 dos2unix-4.1.2.tar.gz 38fbcb4bcbd73e94c3bdf7b5bdf95f78 dos2unix-5.1.tar.gz