From 22599c5362d64aa20bb81daaef161eeb9512573b Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Sep 05 2017 18:52:32 +0000
Subject: 1.10


---

diff --git a/.gitignore b/.gitignore
index d0100ee..f30193d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /rpmlint-1.7.tar.xz
 /rpmlint-1.8.tar.gz
 /rpmlint-1.9.tar.gz
+/rpmlint-1.10.tar.gz
diff --git a/rpmlint.spec b/rpmlint.spec
index 7f2c6c2..4345b0c 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -15,8 +15,8 @@
 %endif
 
 Name:           rpmlint
-Version:        1.9
-Release:        12%{?dist}
+Version:        1.10
+Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 Group:          Development/Tools
 License:        GPLv2
@@ -28,28 +28,6 @@ Source3:        %{name}-etc.config
 Source4:        %{name}.config.el4
 # EL-5 specific config
 Source5:        %{name}.config.el5
-# Combines all of these upstream changes
-# https://github.com/rpm-software-management/rpmlint/commit/4ddbcccc5e12e4f3777ca0790880afa63e91e2fb
-# https://github.com/rpm-software-management/rpmlint/commit/d2de79e1f855a6852be9e337314cdf5e0e594993
-# https://github.com/rpm-software-management/rpmlint/commit/15e4ae11e498530f975574567fca0e65a9a0acb7
-# https://github.com/rpm-software-management/rpmlint/commit/d08a7ce333355898dea05b1ed82c5884eccde5ff
-Patch0:         rpmlint-1.9-unicodefix.patch
-# Python 3.6rc1 (3.6.0) bytecode magic value
-# https://github.com/rpm-software-management/rpmlint/pull/86 (hand-rediffed)
-Patch1:         rpmlint-1.9-py36magic.patch
-# https://github.com/rpm-software-management/rpmlint/commit/a81fdca0185d5ed9868a6ddafca1812082029714
-Patch2:		rpmlint-1.9-fix-uep.patch
-# Python 3.5.3 bytecode magic value update
-# https://github.com/rpm-software-management/rpmlint/commit/beb32c4cfbff4aa979141941f534d2c6b7a18639 (hand-rediffed)
-Patch3:		rpmlint-1.9-py35magic.patch
-# rpmlint fails: str object has no attribute decode
-# https://github.com/rpm-software-management/rpmlint/commit/4875475c43098e37a4d5d4e2ee2f9dfea643cc78 (hand-rediffed)
-# https://github.com/rpm-software-management/rpmlint/commit/73d62d4421a06a3282c1a71625b070e3ca58b624 (hand-rediffed)
-# https://bugzilla.redhat.com/show_bug.cgi?id=1439941
-Patch4:		rpmlint-1.9-py3_b2s.patch
-Patch5:		rpmlint-1.9-py3_test_b2s.patch
-# https://github.com/rpm-software-management/rpmlint/commit/4ec1b845a681ce65c02e4db72c6b7ee99fe1b622
-Patch6:		rpmlint-1.9-buildid-fixes.patch
 BuildArch:      noarch
 %if %{with python3}
 BuildRequires:  python3-devel
@@ -100,13 +78,6 @@ and source packages as well as spec files can be checked.
 
 %prep
 %setup -q -n %{name}-%{name}-%{version}
-%patch0 -p1 -b .unicodefix
-%patch1 -p1 -b .py36magic
-%patch2 -p1 -b .fixuep
-%patch3 -p1 -b .py35magic
-%patch4 -p1 -b .py3b2s
-%patch5 -p1 -b .py35b2s_test
-%patch6 -p1 -b .buildid
 sed -i -e /MenuCheck/d Config.py
 cp -p config config.example
 install -pm 644 %{SOURCE3} config
@@ -156,6 +127,9 @@ make check PYTHON=%{python} PYTEST=%{pytest} FLAKE8=%{flake8}
 %{_mandir}/man1/rpmlint.1*
 
 %changelog
+* Tue Sep  5 2017 Tom Callaway <spot@fedoraproject.org> - 1.10-1
+- update to 1.10
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/sources b/sources
index 83aa30a..22ace0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-810d7fd565d389fec305ff80af53ba40  rpmlint-1.9.tar.gz
+SHA512 (rpmlint-1.10.tar.gz) = e2d4a5189f13ba7f12af9b72955bb355e2a384f3130fd12a452b81f19126b66496b84ce7cc8cb17c449b793fe8ff574297b26be50a84668a1cfe736aa304f974