import UBI dos2unix-7.5.2-3.el10

2025-05-14 18:59:58 +00:00
7 changed files with 150 additions and 41 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-SOURCES/dos2unix-7.4.0.tar.gz
-/dos2unix-7.4.0.tar.gz
+dos2unix-7.5.2.tar.gz
--- a/38C1F572B12725BE.asc
+++ b/38C1F572B12725BE.asc
@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFLEHEMBCAC9kzAdk8RYR7UB38kbLJjxfbevvP/yAfZE0RCTjWeMVB1TpeUI
+bJA8As7qOfYvxe/ADwr9RmdIXN3w9zJjexsyxGTT84wj6+dGlwoLoCC38PsbTykP
+d/OhF+Poh0DczXk+EEVKWkWYZ8y+c80kPTWKDu++URHhReb9R+ns93XtYdCCjqhr
+orEQJK/Z6VOs+9190Uo11qcYm9nx9ryNx4l8BSvkPS7nf9Nak+XkCUFgifaGp3lV
+H/0eAI7bJ7TnbeeuqcBQBS7LUwe25nrPrZhKNCnQzCr6TXJfXNzDp2odRRHrhWmH
+k8ooCkCpMBv19v0V4HlcejyWRWHdRTTurAItABEBAAG0M0Vyd2luIFdhdGVybGFu
+ZGVyIChGb3V0ZSBib2VsKSA8d2F0ZXJsYW5AeHM0YWxsLm5sPokBOAQTAQIAIgUC
+UsQcQwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQOMH1crEnJb6oIwgA
+i/OlDF/tGOn5KBY14pKHhMALass8EBG47cF80ixFWTkUlPeKhkZFkL6SN5bfFhu7
+bg7cwbBPFMgTVvocZwZDkhELwILWx9nPh4ZXcxwWql4Q3ccjoaCNhgCL9istZvSq
+ZNlITHR9i7yTc2mPI0DhOu9jR0abBL45GtV2Inw/AzjdWi1gGrjkt/SAY+d22X24
+DUuUQqS/fB7u4Hy1GA4K/4kOjtUt7HbzZffoxG3H6iFEUw8PIEirdF3X8LVfIvOJ
+FzM6HL1xd5HJIa1uIEnvp8MMQAtznwtxQI2EvmgzTo02SVWvO4pMYXVijZYnbKjX
+zIzMBggeUIyhUnF8UJOJvLkBDQRSxBxDAQgA2hW/xSMvgH8IF4JAkmF19L5IM/LG
+9Sz3LocWAzN1fKlNQZHiXMBnKsVSHnKoV903YpWQ1XtqpJCt3Nxwo/sLJLRGkyRK
+rZ8dYfEVlPyF6Ol8BYt0vjxoycrIZOBBNT0bV/4R8+YC9z50hzZD6XAZzBm9MQin
+mQCEAOmBxWPIElqsrM9CTfT6n4CerTUNiE8/GsmSD1RsBZVn/mPedfwMh51MHBbG
+bpj63tNdvwB6G15kxDlXaMjw0DnAKI7jFoFGqZygaqdChDJQHZJ9beohKd9BhsGa
+3m8oprPP+KGki8oHM+s1SzqRNNjY2viOEf72cW0sGxQTMK8q6mGk0WTl/QARAQAB
+iQEfBBgBAgAJBQJSxBxDAhsMAAoJEDjB9XKxJyW+TZoH/2pG+QN0KRj++1HDjQ3J
+iO0sYoRZQRMuvZSsDu/ZpohjVw0pJmNidDgTwYAIyTD+Y6mJYZkyDVOidePS1kpH
+mLIW+eTUtz9mfryWOcszYWa11nlCg1Wp0iIIMK8qN76kGnh8YymC83AkW6/Kqa80
+/Mn2sCmjUBtobER0galmgwC+EOHSYUHBujVJsfaP0xdnBIiweVz92eq27fpd+/w/
+TKJh91Yg1g6+y69Jslv2tSpuRGo/80l/Cx3QZWPF43S81e7O+sHutI+e6Uh+4mWW
+2RNFfLC6RKpMonmaXSGFQCtcn/0V2GK7SRqhZrPnlwEMz0tg2lTgaCLZKG40JMOs
+Bng=
+=t4n0
+-----END PGP PUBLIC KEY BLOCK-----
--- a/dos2unix-7.4.0-annocheck.patch
+++ b/dos2unix-7.4.0-annocheck.patch
@ -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       =
--- a/dos2unix-7.5.2.tar.gz.asc
+++ b/dos2unix-7.5.2.tar.gz.asc
@ -0,0 +1,10 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEcBAABAgAGBQJlruQQAAoJEDjB9XKxJyW+TqQIAJ9ugpTljcjqBEuj7Z31KM8s
+k7+ZK0zRcvbxW63zQ3v4dgQzRMyNDOTuPBTm5VzD2OPyH8j2xPd4FuE9lPNUnh0Y
+YdjkgqJua61iMBqaJ3zi1xOb3HxfVprmSN2u3OgjTMJsMSVh6dbHUnkH1MGNbpcO
+mJYHEVB1Id0CNCaLy4xYe+8TN19KB/2QIV0YVGNvt+cE9XNPFVzeIJBNmDQTnhLX
+xnHAd4Y1uG68GbEEni+70I/wCFGUqlGTvGhyBftzDXbF23tsNtydLIX6vWm17+nH
+kJ3oUD4q6r0quKDy+KA1yDGBKXUk+y/3///tkoGbXEEcuj0r7v3b2hQYW/TXhfw=
+=8PSc
+-----END PGP SIGNATURE-----
--- a/dos2unix.spec
+++ b/dos2unix.spec
@ -1,39 +1,50 @@
 Summary: Text file format converters
 Name: dos2unix
-Version: 7.4.0
+Version: 7.5.2
 Release: 3%{?dist}
-Group: Applications/Text
-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
+License: BSD-3-Clause
+URL: https://waterlan.home.xs4all.nl/dos2unix.html
+Source: https://waterlan.home.xs4all.nl/dos2unix/%{name}-%{version}.tar.gz
+Source: https://waterlan.home.xs4all.nl/dos2unix/%{name}-%{version}.tar.gz.asc
+Source: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x38C1F572B12725BE#./38C1F572B12725BE.asc
+
+BuildRequires: gcc
 BuildRequires: gettext
+BuildRequires: make
+# perl modules, required for tests
+BuildRequires: perl-Test-Harness
+BuildRequires: perl-Test-Simple
+# for gpg signature verification
+BuildRequires: gnupg2
+
 Provides: unix2dos = %{version}-%{release}
 Obsoletes: unix2dos < 5.1-1

 %description
-Convert text files with DOS or Mac line endings to Unix line endings and 
+Convert text files with DOS or Mac line endings to Unix line endings and
 vice versa.

 %prep
-%setup -q
-%patch0 -p1 -b .annocheck
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%autosetup

 %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}
+rm -rf %{buildroot}%{_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 +52,89 @@ 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
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 7.5.2-3
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 7.5.2-2
+- Bump release for June 2024 mass rebuild
+
+* Wed Jan 24 2024 Tim Waugh <twaugh@redhat.com> - 7.5.2-1
+- Update to 7.5.2 (bug #2259911).
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.5.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.5.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Nov 13 2023 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 7.5.1-2
+- Add gpg signature check
+- Misc changes
+
+* Wed Sep 20 2023 Tim Waugh <twaugh@redhat.com> - 7.5.1-1
+- Update to 7.5.1 (bug #2235872).
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu May 18 2023 Tim Waugh <twaugh@redhat.com> - 7.5.0-1
+- Update to 7.5.0 (bug #2208091).
+
+* Tue Feb 21 2023 Than Ngo <than@redhat.com> - 7.4.4-2
+- migrated to SPDX license
+
+* Mon Feb 13 2023 Tim Waugh <twaugh@redhat.com> - 7.4.4-1
+- Update to 7.4.4 (bug #2169078).
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jun  7 2022 Tim Waugh <twaugh@redhat.com> - 7.4.3-1
+- Update to 7.4.3 (bug #2093708).
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* 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
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +0,0 @@
--- !Policy
-product_versions:
-  - rhel-8
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (dos2unix-7.4.0.tar.gz) = 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9
+SHA512 (dos2unix-7.5.2.tar.gz) = d76d799435dd248850f72cc50af2144a51e99f04ea83a1447c4edd828625c83f0afba367da51aa83defced4cbf34f3b75387a0821010f7b212225571036efbb2