From 1d9eafee4383ca672a90fe0644c5ecb8e51e6e64 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Fri, 14 Jul 2017 13:06:27 +0100
Subject: [PATCH] trim unnecessary doc, examples content (#1470891) Resolves:
 rhbz#1470891

---
 .gitignore |  2 ++
 expat.spec | 12 +++++++-----
 sources    |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7b9bcab..aaf038b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ expat-2.0.1.tar.gz
 /expat-2.1.1.tar.bz2
 /expat-2.2.0.tar.bz2
 /expat-2.2.1.tar.gz
+/expat-2.2.2.tar.gz
+/libexpat-R_*
diff --git a/expat.spec b/expat.spec
index e52635c..3268cd2 100644
--- a/expat.spec
+++ b/expat.spec
@@ -1,8 +1,10 @@
+%global unversion 2_2_2
+
 Summary: An XML parser library
 Name: expat
-Version: 2.2.1
-Release: 2%{?dist}
-Source: https://github.com/libexpat/libexpat/archive/R_2_2_1.tar.gz#/expat-2.2.1.tar.gz
+Version: %(echo %{unversion} | sed 's/_/./g')
+Release: 1%{?dist}
+Source: https://github.com/libexpat/libexpat/archive/R_%{unversion}.tar.gz#/expat-%{version}.tar.gz
 URL: https://libexpat.github.io/
 License: MIT
 BuildRequires: autoconf, libtool, xmlto
@@ -32,7 +34,7 @@ The expat-static package contains the static version of the expat library.
 Install it if you need to link statically with expat.
 
 %prep
-%setup -q -n libexpat-R_%(echo %{version} | sed 's/\./_/g')/expat
+%setup -q -n libexpat-R_%{unversion}/expat
 sed -i '
 s/docbook2x-man/xmlto man --skip-validation/
 /^xmlwf.1: XMLWF/d
@@ -79,7 +81,7 @@ make check
 
 %changelog
 * Fri Jul  7 2017 Joe Orton <jorton@redhat.com> - 2.2.1-2
-- trim unnecessary doc, examples content
+- trim unnecessary doc, examples content (#1470891)
 
 * Mon Jun 19 2017 Joe Orton <jorton@redhat.com> - 2.2.1-1
 - update to 2.2.1 (#1462474)
diff --git a/sources b/sources
index 4c96b11..869b982 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (expat-2.2.1.tar.gz) = eb43ee0efe7623f46f8040966c0bb501edc1c53a44c92e4c5baddfd73cb07e215b777c82ffad0a683d0bfd57c09e6ce2dae6c3455658560ffe8561388b5cd4db
+SHA512 (expat-2.2.2.tar.gz) = c62abe6cedd7a9f4d2cd5e74d12a303edfc996309ce4431d0c4d4229b5d3b8608716a5227c00aa9e80cbcb0c657c4c2ff0168e624038043ffa5c0db9967f8e5c