From 45c91424c6b342a9130eb49c0253e7c62f517255 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code@musicinmybrain.net>
Date: Feb 23 2021 22:39:30 +0000
Subject: Improve keyring generation instructions; reflow description text; whitespace changes according to personal preference; add release summary files to documentation; add %_hardened_build macro, which still matters on EPEL


---

diff --git a/libss7.spec b/libss7.spec
index 02d1120..5a3e889 100644
--- a/libss7.spec
+++ b/libss7.spec
@@ -1,40 +1,39 @@
 Name:           libss7
 Version:        2.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 %global so_version 2
 Summary:        SS7 protocol services to applications
 
-
 License:        GPLv2
-
 URL:            https://www.asterisk.org/
 %global src_base https://downloads.asterisk.org/pub/telephony/%{name}/releases
 Source0:        %{src_base}/%{name}-%{version}.tar.gz
 Source1:        %{src_base}/%{name}-%{version}.tar.gz.asc
-# Keyring with developer signatures created on 2020-12-04 with:
-#
-# gpg --with-fingerprint libss7-2.0.0.tar.gz.asc 2>&1 |
-#   awk '$2 == "using" { print "0x" $NF }' |
-#   xargs gpg2 --no-default-keyring --keyring ./libss7-tmp.gpg \
-#       --keyserver=hkp://pool.sks-keyservers.net --recv-keys
-# gpg2 --export --export-options export-minimal --keyring ./libss7-tmp.gpg \
-#    > libss7.gpg
-# rm -f ./libss7-tmp.gpg
-#
-# Inspect keys using: gpg --list-keys --keyring ./libss7.gpg
+# Keyring with developer signatures created on 2021-02-23 with:
+#   workdir="$(mktemp --directory)"
+#   gpg2 --with-fingerprint libss7-2.0.0.tar.gz.asc 2>&1 |
+#     awk '$2 == "using" { print "0x" $NF }' |
+#     xargs gpg2 --homedir="${workdir}" \
+#         --keyserver=hkp://pool.sks-keyservers.net --recv-keys
+#   gpg2 --homedir="${workdir}" --export --export-options export-minimal \
+#       > libss7.gpg
+#   rm -rf "${workdir}"
+# Inspect keys using:
+#   gpg2 --list-keys --no-default-keyring --keyring ./libss7.gpg
 Source2:        %{name}.gpg
 
-
 BuildRequires:  gcc
 BuildRequires:  make
 BuildRequires:  gnupg2
 
+%global _hardened_build 1
+
 %description
-libss7 is a userspace library that is used for providing SS7 protocol
-services to applications.  It has a working MTP2, MTP3, and ISUP for
-ITU and ANSI style SS7, however it was written in a manner that will
-easily allow support for other various national specific variants in
-the future.
+%{name} is a userspace library that is used for providing SS7 protocol
+services to applications. It has a working MTP2, MTP3, and ISUP for ITU and
+ANSI style SS7, however it was written in a manner that will easily allow
+support for other various national specific variants in the future.
+
 
 %package        devel
 Summary:        Development files for %{name}
@@ -44,10 +43,12 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+
 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %setup -q
 
+
 %build
 %set_build_flags
 # The warnings here look like real problems, and should be reported upstream. A
@@ -64,24 +65,40 @@ developing applications that use %{name}.
 export CFLAGS="${CFLAGS} -Wno-error=stringop-truncation"
 %make_build
 
+
 %install
 %make_install libdir=%{_libdir}
 find %{buildroot} -name '*.a' -print -delete
 
+
 %if 0%{?epel} && 0%{?epel} < 8
 %ldconfig_scriptlets
 %endif
 
+
 %files
 %license LICENSE
-%doc ChangeLog NEWS* README
+%doc ChangeLog
+%doc NEWS*
+%doc README
+%doc %{name}-%{version}-summary.*
+
 %{_libdir}/%{name}.so.%{so_version}*
 
+
 %files devel
 %{_includedir}/%{name}.h
 %{_libdir}/%{name}.so
 
+
 %changelog
+* Tue Feb 23 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 2.0.0-6
+- Improve keyring generation instructions
+- Reflow description text
+- Whitespace changes according to personal preference
+- Add release summary files to documentation
+- Add %%_hardened_build macro, which still matters on EPEL
+
 * Sun Feb 14 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 2.0.0-5
 - Make dependency from -devel subpackage on main package arch-specific
 - Use %%setup macro instead of %%setup0