Compare commits

...

No commits in common. "c8s" and "c9" have entirely different histories.
c8s ... c9

4 changed files with 56 additions and 31 deletions

View File

@ -1 +1 @@
fec41c9ea7b87db597bd20abf79b053b82689974 SOURCES/dos2unix-7.4.0.tar.gz
e2d6dab6a57e122de330d36639ccb43a6432534d SOURCES/dos2unix-7.4.2.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/dos2unix-7.4.0.tar.gz
SOURCES/dos2unix-7.4.2.tar.gz

View File

@ -1,12 +0,0 @@
diff -up dos2unix-7.4.0/Makefile.annocheck dos2unix-7.4.0/Makefile
--- dos2unix-7.4.0/Makefile.annocheck 2018-09-12 14:13:45.959517746 +0200
+++ dos2unix-7.4.0/Makefile 2018-09-12 14:15:13.800825487 +0200
@@ -358,7 +358,7 @@ ifdef LFS
endif
LDFLAGS_USER =
-LDFLAGS = $(RPM_OPT_FLAGS) $(LDFLAGS_EXTRA) $(LDFLAGS_USER)
+LDFLAGS = $(RPM_OPT_FLAGS) $(LDFLAGS_EXTRA) $(LDFLAGS_USER) $(RPM_LD_FLAGS)
LIBS = $(LIBS_EXTRA)
DEFS_USER =

View File

@ -1,13 +1,15 @@
Summary: Text file format converters
Name: dos2unix
Version: 7.4.0
Release: 3%{?dist}
Group: Applications/Text
Version: 7.4.2
Release: 4%{?dist}
License: BSD
URL: http://waterlan.home.xs4all.nl/dos2unix.html
Source: http://waterlan.home.xs4all.nl/dos2unix/%{name}-%{version}.tar.gz
Patch0: dos2unix-7.4.0-annocheck.patch
URL: https://waterlan.home.xs4all.nl/dos2unix.html
Source: https://waterlan.home.xs4all.nl/dos2unix/%{name}-%{version}.tar.gz
BuildRequires: gcc
BuildRequires: gettext
# perl modules, required for tests
BuildRequires: perl-Test-Harness perl-Test-Simple
BuildRequires: make
Provides: unix2dos = %{version}-%{release}
Obsoletes: unix2dos < 5.1-1
@ -17,23 +19,24 @@ vice versa.
%prep
%setup -q
%patch0 -p1 -b .annocheck
%build
export CC=gcc
make %{?_smp_mflags}
%make_build LDFLAGS="%{build_ldflags}"
%install
make DESTDIR=$RPM_BUILD_ROOT install
%make_install
# We add doc files manually to %%doc
rm -rf $RPM_BUILD_ROOT%{_docdir}
%find_lang %{name} --with-man --all-name
%check
make test
%files -f %{name}.lang
%defattr(-,root,root,0755)
%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
%{_bindir}/dos2unix
%{_bindir}/mac2unix
@ -41,12 +44,46 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%{_bindir}/unix2mac
%{_mandir}/man1/*.1*
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Sep 12 2018 Than Ngo <than@redhat.com> - 7.4.0-3
- Fixed bz#1624104, annocheck distro flag failures in dos2unix
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 7.4.2-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 7.4.2-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* 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
- Update to 7.4.2 (#1887599)
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Sep 24 2019 Tim Waugh <twaugh@redhat.com> - 7.4.1-1
- Update to 7.4.1 (#1755150)
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Mar 06 2019 Than Ngo <than@redhat.com> - 7.4.0-7
- Enable tests
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jul 23 2018 Tim Waugh <twaugh@redhat.com> - 7.4.0-5
- Build requires gcc (bug #1603820).
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue May 08 2018 Tim Waugh <twaugh@redhat.com> - 7.4.0-3
- Fix build flags injection (bug #1573086).
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild