From d6c93927cda1c5c716d1ecca7acf9166b8a85124 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Wed, 6 Jan 2016 10:04:00 -0700
Subject: [PATCH] Update to Asciidoctor 1.5.4 (rhbz#1295758)

- Use %license macro
- Drop unnecessary "-p" flag to cp during %install ("-a" already
  preserves timestamps)
---
 .gitignore               |  1 +
 rubygem-asciidoctor.spec | 31 ++++++++++++++++---------------
 sources                  |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index fa4c8df..14b395e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /asciidoctor-1.5.2.gem
 /asciidoctor-1.5.3.gem
+/asciidoctor-1.5.4.gem
diff --git a/rubygem-asciidoctor.spec b/rubygem-asciidoctor.spec
index f22b56c..5a2ac31 100644
--- a/rubygem-asciidoctor.spec
+++ b/rubygem-asciidoctor.spec
@@ -5,7 +5,7 @@
 
 Summary: A fast, open source AsciiDoc implementation in Ruby
 Name: rubygem-%{gem_name}
-Version: 1.5.3
+Version: 1.5.4
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -88,44 +88,45 @@ LANG=en_US.utf8 ruby -I"lib:test" test/*_test.rb
 
 %install
 mkdir -p %{buildroot}%{gem_dir}
-cp -pa .%{gem_dir}/* \
-        %{buildroot}%{gem_dir}/
+cp -a .%{gem_dir}/* \
+       %{buildroot}%{gem_dir}/
 
 mkdir -p %{buildroot}%{_bindir}
-cp -pa .%{_bindir}/* \
-        %{buildroot}%{_bindir}/
+cp -a .%{_bindir}/* \
+       %{buildroot}%{_bindir}/
 
 mkdir -p %{buildroot}%{mandir}
-cp -pa .%{gem_instdir}/man/*.1 \
-        %{buildroot}%{mandir}/
-
-mkdir -p %{buildroot}%{_sysconfdir}/%{gem_name}
-cp -pa .%{gem_instdir}/compat/* \
-        %{buildroot}%{_sysconfdir}/%{gem_name}/
+cp -a .%{gem_instdir}/man/*.1 \
+       %{buildroot}%{mandir}/
 
 %files
+%{!?_licensedir:%global license %%doc}
 %dir %{gem_instdir}
 %exclude %{gem_cache}
-%exclude %{gem_instdir}/benchmark
-%exclude %{gem_instdir}/compat
 %exclude %{gem_instdir}/man
 %exclude %{gem_instdir}/test
 %exclude %{gem_instdir}/features
+%license %{gem_instdir}/LICENSE.adoc
 %doc %{gem_instdir}/CHANGELOG.adoc
-%doc %{gem_instdir}/LICENSE.adoc
+%doc %{gem_instdir}/CONTRIBUTING.adoc
 %doc %{gem_instdir}/README.*
 %{gem_instdir}/data
 %{_bindir}/*
 %{gem_instdir}/bin
 %{gem_libdir}
 %{mandir}/*
-%{_sysconfdir}/%{gem_name}/*
 %{gem_spec}
 
 %files doc
 %doc %{gem_docdir}
 
 %changelog
+* Tue Jan 05 2016 Ken Dreyer <ktdreyer@ktdreyer.com> - 1.5.4-1
+- Update to Asciidoctor 1.5.4 (rhbz#1295758)
+- Use %%license macro
+- Drop unnecessary "-p" flag to cp during %%install ("-a" already preserves
+  timestamps)
+
 * Mon Nov 02 2015 Ken Dreyer <ktdreyer@ktdreyer.com> - 1.5.3-1
 - Update to Asciidoctor 1.5.3 (rhbz#1276851)
 - Drop Fedora 19 and 20 macros (these distros are EOL)
diff --git a/sources b/sources
index 0dc2d29..bb4adce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13c23ef701978ccb1de301897ad06af0  asciidoctor-1.5.3.gem
+af6d1ca58e9ca0384a8f813e1a306b23  asciidoctor-1.5.4.gem