[rpms/keychecker] epel10: Merge branch 'epel7'

[rpms/keychecker] epel10: Merge branch 'epel7'

[Carl George]

A new commit has been pushed.

Repo   : rpms/keychecker
Branch : epel10
Commit : 219574a207cce16f98c86d9267edf09c9fd55765
Author : Carl George <carl@george.computer>
Date   : 2017-11-27T21:12:00-06:00
Stats  : +39/-23 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/keychecker/c/219574a207cce16f98c86d9267edf09c9fd55765?branch=epel10

Log:
Merge branch 'epel7'

---
diff --git a/keychecker.spec b/keychecker.spec
index 4f4a67c..2ea1f69 100644
--- a/keychecker.spec
+++ b/keychecker.spec
@@ -8,6 +8,9 @@ License:        GPLv2+
 URL:            https://github.com/jds2001/keychecker
 Source0:        https://github.com/jds2001/%{name}/archive/v%{version}.tar.gz
 BuildArch:      noarch
+%if 0%{?rhel} && 0%{?rhel} <= 6
+Requires:      python-argparse
+%endif
 
 %description
 Separately list rpm's based on the GPG key they were signed with

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
--- a/.cvsignore
+++ /dev/null

diff --git a/.gitignore b/.gitignore
index 2948295..5499372 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+keychecker-0.2.tar.gz
 /v1.0.tar.gz

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 8c68a50..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: keychecker
-# $Id$
-NAME := keychecker
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

diff --git a/keychecker.spec b/keychecker.spec
index e55ae33..2ea1f69 100644
--- a/keychecker.spec
+++ b/keychecker.spec
@@ -1,6 +1,6 @@
 Name:           keychecker
 Version:        1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Generate list of installed packages sorted by GPG key
 
 Group:          Applications/System
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            https://github.com/jds2001/keychecker
 Source0:        https://github.com/jds2001/%{name}/archive/v%{version}.tar.gz
 BuildArch:      noarch
-%if 0%{rhel} <=6
+%if 0%{?rhel} && 0%{?rhel} <= 6
 Requires:      python-argparse
 %endif
 
@@ -35,12 +35,45 @@ rm -rf $RPM_BUILD_ROOT
 %doc README LICENSE known_keys.txt
 
 %changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sun Jun 11 2017 Jon Stanley <jonstanley@gmail.com> - 1.0-2
+- Remove RHEL conditional for Fedora
+
 * Sun Jun 11 2017 Jon Stanley <jonstanley@gmail.com> - 1.0-1
 - Python 3 compatibility (carlgeorge)
 - Migrate to argparse
 - Various minor cleanups
 - Remove BuildRoot tag as no longer needed
 
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Sun Aug 16 2009 Jon Stanley <jonstanley@gmail.com> - 0.2-1
 - Add option for getting keys from a file