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

GNU Hello 2.12, and boo#1197575

OBS-URL: https://build.opensuse.org/request/show/965504
OBS-URL: https://build.opensuse.org/package/show/Base:System/hello?expand=0&rev=21

hello-1.3.dif

@@ -1,4 +0,0 @@
---- TODO
-+++ TODO	1997/09/04 09:57:22
-@@ -0,0 +1 @@
-+Add sound support

hello-2.10.tar.gz

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

hello-2.10.tar.gz.sig

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAABCAAGBQJUaJPFAAoJEKlVMkX96bc5EuMP/2Z8T2r+ZjJbveEfVKuY3LbG
-sPqZqI/t0WISsfhRen3R/tiis0lN8TWIdTFRnLqtxyqfzDDtgzrPg8gwICFYxE6W
-ffVvgbbDA14EuatWHfnAK1SjWsaemJIO1rGROgNFqsatEDIOf7bg4NZ6Gs1QR0rJ
-p4W+LYKiP8UeJwV4Xd2d/h+rf4XBWo5HTNYwgZpZawklWupmIx0bXi3HiRs4MJQm
-mfbNrNE5YcAWQpBwAxgcUCwGHlvDonpvu0i0D4tNoMeneLAhZty1GCnamTlcuDXJ
-IZpg0Ky9mYEnyRhaRnLsyaZ2kzJhOSMNfVzSP2+ge+JfTuenw1yvhAZC9qTLoV+f
-1xUhxUkmzgDV3pVpc9qB+LVGfJclrHtrgD2dakmph5JGGhAoAExwrkyO3qxE5jzJ
-x2C83aNpBjNqPhAVIcywXpFWBT8sbsXgwLufXWFwQtyxIm1dxrOku0SI5oYm1ZON
-l1rjkaQmpFKx1oo7eOG1XLbCQ1Ii1qEDSiXTvQwoaBTkAcPz1KOVGEyby6kf9AS9
-DjuJzh8oQgylaDk5FqGqsY6S90Naz7SJSrBi/3xOP51LvsLciNx+EPBNrRJzFDYw
-svn/ahaWx4hsXr0ErjqAzqE6ZNQQcyKa5qDDFD5dz14dSI78FjZ4u2WUwZCGyW+u
-OFOwPF0lXuPO6q2UFcpj
-=s6wC
------END PGP SIGNATURE-----

hello-2.12-reproducible.patch

@@ -0,0 +1,38 @@
+From: Andreas Stieger <Andreas.Stieger@gmx.de>
+Date: Mon, 28 Mar 2022 23:57:16 +0200
+Subject: make hello build reproducible build with PGO
+References: boo#1197575
+Upstream: no
+
+Simply removes the date based skipping.
+
+Index: hello-2.12/tests/greeting-2
+===================================================================
+--- hello-2.12.orig/tests/greeting-2
++++ hello-2.12/tests/greeting-2
+@@ -15,25 +15,6 @@ cat <<EOF > greeting-test2.ok
+ Wuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuhhh!
+ EOF
+ 
+-# Werewolves cry at full moon only.
+-set x `TZ=GMT date +"%Y %j %H %M %S"`; shift
+-year=$1; day=$2; hours=$3; minutes=$4; seconds=$5
+-years_since_2000=`expr $year - 2000`
+-days_since_2000=`expr '(' $years_since_2000 '*' 365 ')' + '(' '(' $years_since_2000 - 1 ')' / 4 ')' + $day`
+-seconds_since_2000=`expr '(' '(' '(' '(' '(' $days_since_2000 '*' 24 ')' + $hours ')' '*' 60 ')' + $minutes ')' '*' 60 ')' + $seconds`
+-# A moon period is ca. 2551442.8 seconds.
+-remainder=`expr $seconds_since_2000 % 2551443`
+-# Full moon is around remainder = 1760000, oscillating between ca. 1720000
+-# and ca. 1805000. Allow a tolerance of +/- 24 h.
+-if test `expr $remainder '>' 1650000` = 0 || test `expr $remainder '<' 1890000` = 0; then
+-  { echo "$0: Skipping test: not a full moon night"; rm -fr $tmpfiles; exit 77; }
+-fi
+-
+-# The exit 77 is the magic value which tells Automake's `make check'
+-# that this test was skipped.  It's also good to give a
+-# human-understandable reason why the test was skipped, so the person
+-# running the test can know.
+-
+ tmpfiles="$tmpfiles greeting-test2.out"
+ : ${HELLO=hello}
+ ${HELLO} -g 'Wuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuhhh!' \

hello-2.12.tar.gz

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

hello-2.12.tar.gz.sig

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEJAk/AW/+hgLvRJu4TI7z2j/TcjAFAmH4MV8ACgkQTI7z2j/T
+cjB9hQgAgjig6FTeiSAJP+txn++u2fX9TdvXltAhv+SSwloBagAEC4ZTEEWelHup
+/OjgfMuFTIqTiEfAHqHv0cRFBEja2cf1Rxcveok9a71Lg3oAS2fQd2+BLVX+N3Tw
+KkDsHIy6Y/2LB2CpxDWZxYEh68WtyZ9KW/q2Py22kuo/fkv9gHVETkibxlryTFD8
+GhavbzQoax+PgENVR2z/WMcrbnUBdDPBhRe1Mv4AvLdQwQG1pBS94uCMF09QK0OA
+QAW13St75Xh1SVeo3CaxbjEZMM0zU3a9shfOFhjhs/I44OWsfji7F4JuMYO8r8Vn
+YPOGL4go63n5iu/mLiMsKeEvkqnm1Q==
+=guOG
+-----END PGP SIGNATURE-----

hello.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Mar 28 22:09:01 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- GNU Hello 2.12:
+  * Remove -h and -v short options
+  * Developer visible changes
+- all-round spec update showcasing updated packaging
+- drop hello-1.3.dif
+- make build reproducible boo#1197575 hello-2.12-reproducible.patch
+
 -------------------------------------------------------------------
 Tue Oct 15 07:13:53 UTC 2019 - Ludwig Nussel <lnussel@suse.de>
 

hello.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package hello
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,23 +16,21 @@
 #
 
 
-Name:           hello
 # How to define macros
 %define hello echo "hello world"
-Provides:       mailreader
+Name:           hello
+Version:        2.12
+Release:        0
 Summary:        A Friendly Greeting Program
 License:        GPL-3.0-or-later
 Group:          Development/Tools/Other
-Version:        2.10
-Release:        0
-Url:            http://www.gnu.org/software/hello
-Source0:        ftp://ftp.gnu.org/pub/gnu/hello/hello-%{version}.tar.gz
-Source1:        ftp://ftp.gnu.org/pub/gnu/hello/hello-%{version}.tar.gz.sig
-# https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=hello&download=1
-Source2:        %{name}.keyring
-Patch0:         hello-1.3.dif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+URL:            https://www.gnu.org/software/hello
+Source0:        https://ftp.gnu.org/pub/gnu/%{name}/%{name}-%{version}.tar.gz
+Source1:        https://ftp.gnu.org/pub/gnu/%{name}/%{name}-%{version}.tar.gz.sig
+Source2:        https://savannah.gnu.org/project/release-gpgkeys.php?group=%{name}&download=1#/%{name}.keyring
+Patch0:         hello-2.12-reproducible.patch
 BuildRequires:  makeinfo
+Provides:       mailreader
 
 %description
 The GNU hello program produces a familiar, friendly greeting.  It
@@ -47,37 +45,37 @@ GNU hello supports many native languages.
 %prep
 # Use defined macro
 %{hello}
-%setup -q
-%patch0
+%autosetup -p1
 # force rebuild with non-broken makeinfo
 rm -f doc/*.info
 
 %build
 export CFLAGS="%{optflags}"
 %configure
-%if %do_profiling
-  make CFLAGS="$CFLAGS %cflags_profile_generate" LDFLAGS="-fprofile-arcs"
-  make check
-  make clean
-  make CFLAGS="$CFLAGS %cflags_profile_feedback" LDFLAGS="-fprofile-arcs"
+%if %{do_profiling}
+  %make_build CFLAGS="$CFLAGS %{cflags_profile_generate}" LDFLAGS="-fprofile-arcs"
+  %make_build check
+  %make_build clean
+  %make_build CFLAGS="$CFLAGS %{cflags_profile_feedback}" LDFLAGS="-fprofile-arcs"
 %else
-  make
+  %make_build
 %endif
 
-%check
-make check
-
 %install
 %make_install
 %find_lang %{name}
 
+%check
+%make_build check
+
 %files
-%defattr(-, root, root)
-%doc COPYING TODO NEWS README THANKS ABOUT-NLS
+%license COPYING
+%doc TODO NEWS README THANKS ABOUT-NLS
 %{_bindir}/*
-%{_infodir}/*.gz
-%{_mandir}/*/*
+%{_infodir}/hello.info%{?ext_info}
+%{_mandir}/man1/hello.1%{?ext_man}
 
 %files lang -f %{name}.lang
+%license COPYING
 
 %changelog