Accepting request 841997 from home:AndreasStieger:branches:Base:System

dos2unix 7.4.2

OBS-URL: https://build.opensuse.org/request/show/841997
OBS-URL: https://build.opensuse.org/package/show/Base:System/dos2unix?expand=0&rev=88

dos2unix-7.4.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1cd58a60b03ed28fa39046102a185c5e88c4f7665e1e0417c25de7f8b9f78623
-size 711570

dos2unix-7.4.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6035c58df6ea2832e868b599dfa0d60ad41ca3ecc8aa27822c4b7a9789d3ae01
+size 727429

dos2unix-7.4.2.tar.gz.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEE+PG+pJBJagnMoyjMOMH1crEnJb4FAl+EuZoACgkQOMH1crEn
+Jb7UOgf/XJth7i/UpCl96s3JRVZX7lYWODnyekDq7wPS1WvYixnLzPUg7kqbzQc3
+LDNLgj5yk4Foxl/NocmjiTVSI2c0EnExH6/Oz7h3sOLkdtS8qs9yW5oPEN4+W+Eg
+l3gcnVYoV9wtBu01NP0kZGJIQgUoiOI/tnm+DnyCVELW7MA68VH3FfUvurMfHjpE
+iJXd7OKciv00h64eo742zPekrAOWIO2XTWav3DNstQYyvEnVO/0wAU/vY0mwnyAZ
+QzghpJ+g5GbJgYcveY3rnf3pUjymk0uBh8gmcGxAnopSqZRKVmlC2L3eCHOnwUI5
+BgyjtuZjXrcYt/NI4XmT9zj/6cQC8A==
+=2wwf
+-----END PGP SIGNATURE-----

dos2unix.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct 15 19:37:37 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 7.4.2:
+  * translation update
+- add upstream signing key and verify source signature
+
 -------------------------------------------------------------------
 Wed Sep 25 15:16:51 UTC 2019 - Andreas Stieger <andreas.stieger@gmx.de>
 

dos2unix.keyring

@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.6
+Comment: Hostname: sks.pod02.fleetstreetops.com
+
+mQENBFLEHEMBCAC9kzAdk8RYR7UB38kbLJjxfbevvP/yAfZE0RCTjWeMVB1TpeUIbJA8As7q
+OfYvxe/ADwr9RmdIXN3w9zJjexsyxGTT84wj6+dGlwoLoCC38PsbTykPd/OhF+Poh0DczXk+
+EEVKWkWYZ8y+c80kPTWKDu++URHhReb9R+ns93XtYdCCjqhrorEQJK/Z6VOs+9190Uo11qcY
+m9nx9ryNx4l8BSvkPS7nf9Nak+XkCUFgifaGp3lVH/0eAI7bJ7TnbeeuqcBQBS7LUwe25nrP
+rZhKNCnQzCr6TXJfXNzDp2odRRHrhWmHk8ooCkCpMBv19v0V4HlcejyWRWHdRTTurAItABEB
+AAG0M0Vyd2luIFdhdGVybGFuZGVyIChGb3V0ZSBib2VsKSA8d2F0ZXJsYW5AeHM0YWxsLm5s
+PokBOAQTAQIAIgUCUsQcQwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQOMH1crEn
+Jb6oIwgAi/OlDF/tGOn5KBY14pKHhMALass8EBG47cF80ixFWTkUlPeKhkZFkL6SN5bfFhu7
+bg7cwbBPFMgTVvocZwZDkhELwILWx9nPh4ZXcxwWql4Q3ccjoaCNhgCL9istZvSqZNlITHR9
+i7yTc2mPI0DhOu9jR0abBL45GtV2Inw/AzjdWi1gGrjkt/SAY+d22X24DUuUQqS/fB7u4Hy1
+GA4K/4kOjtUt7HbzZffoxG3H6iFEUw8PIEirdF3X8LVfIvOJFzM6HL1xd5HJIa1uIEnvp8MM
+QAtznwtxQI2EvmgzTo02SVWvO4pMYXVijZYnbKjXzIzMBggeUIyhUnF8UJOJvLkBDQRSxBxD
+AQgA2hW/xSMvgH8IF4JAkmF19L5IM/LG9Sz3LocWAzN1fKlNQZHiXMBnKsVSHnKoV903YpWQ
+1XtqpJCt3Nxwo/sLJLRGkyRKrZ8dYfEVlPyF6Ol8BYt0vjxoycrIZOBBNT0bV/4R8+YC9z50
+hzZD6XAZzBm9MQinmQCEAOmBxWPIElqsrM9CTfT6n4CerTUNiE8/GsmSD1RsBZVn/mPedfwM
+h51MHBbGbpj63tNdvwB6G15kxDlXaMjw0DnAKI7jFoFGqZygaqdChDJQHZJ9beohKd9BhsGa
+3m8oprPP+KGki8oHM+s1SzqRNNjY2viOEf72cW0sGxQTMK8q6mGk0WTl/QARAQABiQEfBBgB
+AgAJBQJSxBxDAhsMAAoJEDjB9XKxJyW+TZoH/2pG+QN0KRj++1HDjQ3JiO0sYoRZQRMuvZSs
+Du/ZpohjVw0pJmNidDgTwYAIyTD+Y6mJYZkyDVOidePS1kpHmLIW+eTUtz9mfryWOcszYWa1
+1nlCg1Wp0iIIMK8qN76kGnh8YymC83AkW6/Kqa80/Mn2sCmjUBtobER0galmgwC+EOHSYUHB
+ujVJsfaP0xdnBIiweVz92eq27fpd+/w/TKJh91Yg1g6+y69Jslv2tSpuRGo/80l/Cx3QZWPF
+43S81e7O+sHutI+e6Uh+4mWW2RNFfLC6RKpMonmaXSGFQCtcn/0V2GK7SRqhZrPnlwEMz0tg
+2lTgaCLZKG40JMOsBng=
+=t4n0
+-----END PGP PUBLIC KEY BLOCK-----

dos2unix.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dos2unix
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,18 +12,21 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           dos2unix
+Version:        7.4.2
+Release:        0
 Summary:        Text converters to and from DOS/MAC to UNIX
 License:        BSD-2-Clause
 Group:          Productivity/Text/Convertors
-Version:        7.4.1
-Release:        0
-Url:            https://waterlan.home.xs4all.nl/dos2unix.html
+URL:            https://waterlan.home.xs4all.nl/dos2unix.html
 Source:         https://waterlan.home.xs4all.nl/dos2unix/dos2unix-%{version}.tar.gz
+Source2:        https://waterlan.home.xs4all.nl/dos2unix/dos2unix-%{version}.tar.gz.asc
+# http://keys.gnupg.net/pks/lookup?op=get&search=0x38C1F572B12725BE
+Source3:        %{name}.keyring
 Provides:       unix2dos = %{version}
 Obsoletes:      unix2dos < %{version}
 
@@ -40,31 +43,25 @@ find . -type f -exec chmod -x '{}' +
 
 %build
 export RPM_OPT_FLAGS
-make %{?_smp_mflags} CC="%{__cc}" HTMLEXT="html"
+%make_build CC="gcc" HTMLEXT="html"
 
 %install
-%makeinstall docdir=%{_defaultdocdir}/%{name} HTMLEXT="html"
-%{find_lang} dos2unix --all-name --with-man
+%make_install docdir=%{_defaultdocdir}/%{name} HTMLEXT="html"
+%find_lang dos2unix --all-name --with-man
 
 %files -f dos2unix.lang
 %defattr(-,root,root,0755)
 %doc %{_defaultdocdir}/%{name}
-%{_bindir}/dos2unix
-%{_bindir}/mac2unix
-%{_bindir}/unix2mac
-%{_bindir}/unix2dos
-%doc %{_mandir}/*/dos2unix.1*
-%doc %{_mandir}/*/mac2unix.1*
-%doc %{_mandir}/*/unix2mac.1*
-%doc %{_mandir}/*/unix2dos.1*
-%doc %lang(de) %dir %_mandir/de
-%doc %lang(es) %dir %_mandir/es
-%doc %lang(fr) %dir %_mandir/fr
-%doc %lang(nl) %dir %_mandir/nl
-%doc %lang(pl) %dir %_mandir/pl
-%doc %lang(pt_BR) %dir %_mandir/pt_BR
-%doc %lang(sv) %dir %_mandir/sv
-%doc %lang(uk) %dir %_mandir/uk
-%doc %lang(zh_CN) %dir %_mandir/zh_CN
+%{_bindir}/*
+%{_mandir}/*/*.1%{?ext_man}
+%doc %lang(de) %dir %{_mandir}/de
+%doc %lang(es) %dir %{_mandir}/es
+%doc %lang(fr) %dir %{_mandir}/fr
+%doc %lang(nl) %dir %{_mandir}/nl
+%doc %lang(pl) %dir %{_mandir}/pl
+%doc %lang(pt_BR) %dir %{_mandir}/pt_BR
+%doc %lang(sv) %dir %{_mandir}/sv
+%doc %lang(uk) %dir %{_mandir}/uk
+%doc %lang(zh_CN) %dir %{_mandir}/zh_CN
 
 %changelog