diff --git a/.gitignore b/.gitignore index 3c65cf0..598e24f 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ dos2unix-5.1.1.tar.gz /dos2unix-7.4.4.tar.gz /dos2unix-7.5.0.tar.gz /dos2unix-7.5.1.tar.gz +/dos2unix-7.5.1.tar.gz.asc diff --git a/38C1F572B12725BE.asc b/38C1F572B12725BE.asc new file mode 100644 index 0000000..f72b6f7 --- /dev/null +++ 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----- diff --git a/dos2unix-7.5.0.tar.gz.asc b/dos2unix-7.5.0.tar.gz.asc deleted file mode 100644 index cfec5c0..0000000 --- a/dos2unix-7.5.0.tar.gz.asc +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEcBAABAgAGBQJkZT/rAAoJEDjB9XKxJyW+prsH/iaQsgIC3bQzz8AbMyK/KjUC -Vxr4tE+DzwoENB9us766yEEgsqqaAi/cZblEvQXnVcTUudpvMJ7kfCx6qRM5bMZu -lxwxXGNiWwruOt8Wyen/FkH9X3Ol/I0T9eiosDw2zRWAu0tpxpxB0yrUcQfPcBFn -0VxzBdFTH1MZiTVDp689eBos6wS2yQ6fwnzf+HT2ontKzwd8XjFZW/E7qv1CsOR0 -JeABxcyl1gzvbk489Mjr/O7of2G6TwJi4Opwp00AD/csp0utIB8FGG90YJ5u/Nu5 -gM7JuuJqELWPg5uaxRH7OS04UyrSUP8pwwG7LX1ETfrj2bjKtlpwmpe7Tt2PXnk= -=VfLY ------END PGP SIGNATURE----- diff --git a/dos2unix-7.5.1.tar.gz.asc b/dos2unix-7.5.1.tar.gz.asc deleted file mode 100644 index 1124707..0000000 --- a/dos2unix-7.5.1.tar.gz.asc +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEcBAABAgAGBQJk7kbGAAoJEDjB9XKxJyW+4DUH/RfqnHViH8/532oZRycIz3Di -hYYqkziR2DwJaW07VU13HtQFS2iLr1FXDgnOnkVFWP4EKqxTPiS1DO5Wlblb0iVN -p9xurEJ2SfvAtlgtXxH2RynLSukg9YBfXGi4MTsodxQouAgmjFFo/KOODI5M+A+R -ZmG/4VtYmarBskhzY0oEeCLAjMmIQMXZKDOmd2uNeXuibQWBa/F/k/OwXqLKBo+M -70nHAqQOqfRRX6myY7jAH/rmEZZIInwTx7LJ1uNvzVJFpV9Jxj9MAGZl2CWmD712 -FmJRY9Ys0vwjPbsLtJlMkXafATNHBEIXgN/nm94ddxteI6QYRAy3u6WT+o+EhAI= -=CSer ------END PGP SIGNATURE----- diff --git a/dos2unix.spec b/dos2unix.spec index def0a18..e5fc19b 100644 --- a/dos2unix.spec +++ b/dos2unix.spec @@ -1,15 +1,22 @@ Summary: Text file format converters Name: dos2unix Version: 7.5.1 -Release: 1%{?dist} +Release: 2%{?dist} 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 -# perl modules, required for tests -BuildRequires: perl-Test-Harness perl-Test-Simple 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 @@ -18,7 +25,8 @@ Convert text files with DOS or Mac line endings to Unix line endings and vice versa. %prep -%setup -q +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%autosetup %build %make_build LDFLAGS="%{build_ldflags}" @@ -27,7 +35,7 @@ vice versa. %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 @@ -45,6 +53,10 @@ make test %{_mandir}/man1/*.1* %changelog +* Mon Nov 13 2023 Mikel Olasagasti Uranga - 7.5.1-2 +- Add gpg signature check +- Misc changes + * Wed Sep 20 2023 Tim Waugh - 7.5.1-1 - Update to 7.5.1 (bug #2235872). diff --git a/sources b/sources index a37b1d6..ad57b47 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (dos2unix-7.5.1.tar.gz) = 733d163fff4effdf8acb382abec9bcd23f594fa17502e9dde2f24d3326aeb7653eee353bef812090ab8dc055136d236b40c2f778deea4ac026c2eed471e763b5 +SHA512 (dos2unix-7.5.1.tar.gz.asc) = 197d528b7b89e7f635e9b6c02abb47a85f45dd28d8f11d50eb3e3ed5ab0a92b9d264c7e05d3b4cf6571bf5059bc3448b68809a2586c1da58485a56abbc1e2f00