Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/dos2unix.git#ca6c40967f582d24f12316343dbc81ae1f285dad
This commit is contained in:
DistroBaker 2021-02-03 13:06:10 +01:00
parent a44f5d696c
commit 071d1cdc48

View File

@ -1,14 +1,15 @@
Summary: Text file format converters Summary: Text file format converters
Name: dos2unix Name: dos2unix
Version: 7.4.2 Version: 7.4.2
Release: 1%{?dist} Release: 2%{?dist}
License: BSD License: BSD
URL: http://waterlan.home.xs4all.nl/dos2unix.html URL: https://waterlan.home.xs4all.nl/dos2unix.html
Source: http://waterlan.home.xs4all.nl/dos2unix/%{name}-%{version}.tar.gz Source: https://waterlan.home.xs4all.nl/dos2unix/%{name}-%{version}.tar.gz
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gettext BuildRequires: gettext
# perl modules, required for tests # perl modules, required for tests
BuildRequires: perl-Test-Harness perl-Test-Simple BuildRequires: perl-Test-Harness perl-Test-Simple
BuildRequires: make
Provides: unix2dos = %{version}-%{release} Provides: unix2dos = %{version}-%{release}
Obsoletes: unix2dos < 5.1-1 Obsoletes: unix2dos < 5.1-1
@ -20,10 +21,10 @@ vice versa.
%setup -q %setup -q
%build %build
make %{?_smp_mflags} LDFLAGS="%{build_ldflags}" %make_build LDFLAGS="%{build_ldflags}"
%install %install
make DESTDIR=$RPM_BUILD_ROOT install %make_install
# We add doc files manually to %%doc # We add doc files manually to %%doc
rm -rf $RPM_BUILD_ROOT%{_docdir} rm -rf $RPM_BUILD_ROOT%{_docdir}
@ -34,7 +35,8 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
make test make test
%files -f %{name}.lang %files -f %{name}.lang
%doc man/man1/dos2unix.htm ChangeLog.txt COPYING.txt %license COPYING.txt
%doc man/man1/dos2unix.htm ChangeLog.txt
%doc NEWS.txt README.txt TODO.txt %doc NEWS.txt README.txt TODO.txt
%{_bindir}/dos2unix %{_bindir}/dos2unix
%{_bindir}/mac2unix %{_bindir}/mac2unix
@ -43,6 +45,9 @@ make test
%{_mandir}/man1/*.1* %{_mandir}/man1/*.1*
%changelog %changelog
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Oct 12 2020 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 7.4.2-1 * Mon Oct 12 2020 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 7.4.2-1
- Update to 7.4.2 (#1887599) - Update to 7.4.2 (#1887599)