.gitignore

@@ -1,29 +1,2 @@
-dos2unix-5.1.1.tar.gz
+SOURCES/dos2unix-7.4.0.tar.gz
-/dos2unix-5.2.tar.gz
-/dos2unix-5.2.1.tar.gz
-/dos2unix-5.3.tar.gz
-/dos2unix-5.3.1.tar.gz
-/dos2unix-5.3.2.tar.gz
-/dos2unix-5.3.3.tar.gz
-/dos2unix-6.0.tar.gz
-/dos2unix-6.0.1.tar.gz
-/dos2unix-6.0.2.tar.gz
-/dos2unix-6.0.3.tar.gz
-/dos2unix-6.0.4.tar.gz
-/dos2unix-6.0.5.tar.gz
-/dos2unix-6.0.6.tar.gz
-/dos2unix-7.0.tar.gz
-/dos2unix-7.1.tar.gz
-/dos2unix-7.2.tar.gz
-/dos2unix-7.2.1.tar.gz
-/dos2unix-7.2.2.tar.gz
-/dos2unix-7.2.3.tar.gz
-/dos2unix-7.3.tar.gz
-/dos2unix-7.3.1.tar.gz
-/dos2unix-7.3.2.tar.gz
-/dos2unix-7.3.3.tar.gz
-/dos2unix-7.3.4.tar.gz
-/dos2unix-7.3.5.tar.gz
 /dos2unix-7.4.0.tar.gz
-/dos2unix-7.4.1.tar.gz
-/dos2unix-7.4.2.tar.gz

dos2unix-7.4.0-annocheck.patch

@@ -0,0 +1,12 @@
+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       =

dos2unix.spec

@@ -1,15 +1,13 @@
 Summary: Text file format converters
 Name: dos2unix
-Version: 7.4.2
+Version: 7.4.0
-Release: 4%{?dist}
+Release: 3%{?dist}
+Group: Applications/Text
 License: BSD
-URL: https://waterlan.home.xs4all.nl/dos2unix.html
+URL: http://waterlan.home.xs4all.nl/dos2unix.html
-Source: https://waterlan.home.xs4all.nl/dos2unix/%{name}-%{version}.tar.gz
+Source: http://waterlan.home.xs4all.nl/dos2unix/%{name}-%{version}.tar.gz
-BuildRequires: gcc
+Patch0: dos2unix-7.4.0-annocheck.patch
 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
 
@@ -19,24 +17,23 @@ vice versa.
 
 %prep
 %setup -q
+%patch0 -p1 -b .annocheck
 
 %build
-%make_build LDFLAGS="%{build_ldflags}"
+export CC=gcc
+make %{?_smp_mflags}
 
 %install
-%make_install
+make DESTDIR=$RPM_BUILD_ROOT 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
-%license COPYING.txt
+%defattr(-,root,root,0755)
-%doc man/man1/dos2unix.htm ChangeLog.txt 
+%doc man/man1/dos2unix.htm  ChangeLog.txt COPYING.txt
 %doc NEWS.txt README.txt TODO.txt
 %{_bindir}/dos2unix
 %{_bindir}/mac2unix
@@ -44,46 +41,12 @@ make test
 %{_bindir}/unix2mac
 %{_mandir}/man1/*.1*
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 7.4.2-4
+* Wed Sep 12 2018 Than Ngo <than@redhat.com> - 7.4.0-3
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Fixed bz#1624104, annocheck distro flag failures in dos2unix
-  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

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

sources

@@ -1 +1 @@
-SHA512 (dos2unix-7.4.2.tar.gz) = 3fb77561596bafd83f3f7807ce967e58d5a96e5235afe3a4074ae7112297445690b2586bf652eb0b5bd1984fd41a79478355f6df8244561b4167a8a09593110d
+SHA512 (dos2unix-7.4.0.tar.gz) = 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9