[rpms/pgpdump] epel10: Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/pgpdump

[rpms/pgpdump] epel10: Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/pgpdump

[Nick Bebout]

A new commit has been pushed.

Repo   : rpms/pgpdump
Branch : epel10
Commit : 3b9693d73cbc77966d24316c173721eb8c379e51
Author : Nick Bebout <nebebout@36WTHB2.usi.edu>
Date   : 2018-07-23T09:38:23-05:00
Stats  : +12/-3 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/pgpdump/c/3b9693d73cbc77966d24316c173721eb8c379e51?branch=epel10

Log:
Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/pgpdump

---
diff --git a/pgpdump.spec b/pgpdump.spec
index 798100d..ac16af5 100644
--- a/pgpdump.spec
+++ b/pgpdump.spec
@@ -1,6 +1,6 @@
 Name:           pgpdump
 Version:        0.33
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PGP packet visualizer
 License:        MIT
 URL:            http://www.mew.org/~kazu/proj/pgpdump/
@@ -30,9 +30,13 @@ OpenPGP (RFC 4880) and PGP version 2 (RFC 1991).
 %{_mandir}/man1/pgpdump.1*
 
 %changelog
-* Mon Jul 23 2018 Nick Bebout <nb@fedoraproject.org> - 0.33-2
+<<<<<<< HEAD
+* Mon Jul 23 2018 Nick Bebout <nb@fedoraproject.org> - 0.33-3
 - Rebuild to fix FTBFS
 
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.33-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Mon Jul 9 2018 Nick Bebout <nb@fedoraproject.org> - 0.33-1
 - Update to 0.33
 

diff --git a/pgpdump.spec b/pgpdump.spec
index 6ee29b3..ac16af5 100644
--- a/pgpdump.spec
+++ b/pgpdump.spec
@@ -1,12 +1,13 @@
 Name:           pgpdump
 Version:        0.33
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PGP packet visualizer
 License:        MIT
 URL:            http://www.mew.org/~kazu/proj/pgpdump/
 Source0:        http://www.mew.org/~kazu/proj/pgpdump/%{name}-%{version}.tar.gz
 BuildRequires:  bzip2-devel
 BuildRequires:  zlib-devel
+BuildRequires:  gcc
 
 %description
 pgpdump is a PGP packet visualizer which displays the packet format of
@@ -29,6 +30,10 @@ OpenPGP (RFC 4880) and PGP version 2 (RFC 1991).
 %{_mandir}/man1/pgpdump.1*
 
 %changelog
+<<<<<<< HEAD
+* Mon Jul 23 2018 Nick Bebout <nb@fedoraproject.org> - 0.33-3
+- Rebuild to fix FTBFS
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.33-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild