From b1b6f8007bcf2b5bbbd2d8cc35d5113c1383e084 Mon Sep 17 00:00:00 2001
From: Matt Jia <mjia@redhat.com>
Date: May 03 2017 05:35:15 +0000
Subject: [PATCH 1/2] fix the long line error in the spec file reported by rpmlint


---

diff --git a/waiverdb.spec b/waiverdb.spec
index e943a2b..2751e9a 100644
--- a/waiverdb.spec
+++ b/waiverdb.spec
@@ -32,7 +32,8 @@ Requires:       fedmsg
 Requires:       python-flask-oidc
 
 %description
-WaiverDB is a companion service to ResultsDB, for recording waivers against test results.
+WaiverDB is a companion service to ResultsDB, for recording waivers
+against test results.
 
 %prep
 %setup -q -n %{name}-%{upstream_version}

From aff0c99c9e9e47ff476af45887c550b070280869 Mon Sep 17 00:00:00 2001
From: Matt Jia <mjia@redhat.com>
Date: May 03 2017 06:13:55 +0000
Subject: [PATCH 2/2] add rpmlint into the Jenkins file


---

diff --git a/Jenkinsfile b/Jenkinsfile
index ff902bb..65fdfea 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,6 +29,7 @@ node('rcm-tools-jslave-rhel-7') {
                 mkdir -p mock-result/el7
                 flock /etc/mock/epel-7-x86_64.cfg \
                 /usr/bin/mock --resultdir=mock-result/el7 -r epel-7-x86_64 --clean --rebuild rpmbuild-output/*.src.rpm
+                rpmlint -f rpmlint-config.py mock-result/el7/*.rpm
                 """
                 archiveArtifacts artifacts: 'mock-result/el7/**'
             },
@@ -37,6 +38,7 @@ node('rcm-tools-jslave-rhel-7') {
                 mkdir -p mock-result/f25
                 flock /etc/mock/fedora-25-x86_64.cfg \
                 /usr/bin/mock --resultdir=mock-result/f25 -r fedora-25-x86_64 --clean --rebuild rpmbuild-output/*.src.rpm
+                rpmlint -f rpmlint-config.py mock-result/f25/*.rpm
                 """
                 archiveArtifacts artifacts: 'mock-result/f25/**'
             },
diff --git a/rpmlint-config.py b/rpmlint-config.py
new file mode 100644
index 0000000..833daa9
--- /dev/null
+++ b/rpmlint-config.py
@@ -0,0 +1,5 @@
+from Config import addFilter
+# RPMs built from git have no %changelog, the proper ones maintained from dist-git do though
+addFilter(r'no-changelogname-tag')
+# RPMs built from git have no source tarball uploaded to PYPI
+addFilter(r'invalid-url')