From 01102cae3635f9119553f914df70af81fed89d6c Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Tue, 5 Jun 2018 18:23:51 -0400
Subject: [PATCH] Fix stuff from package review.

---
 R-showtext.spec | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/R-showtext.spec b/R-showtext.spec
index fa6fc8d..30b0894 100644
--- a/R-showtext.spec
+++ b/R-showtext.spec
@@ -10,7 +10,9 @@ Version:          0.5.1
 Release:          1%{?dist}
 Summary:          Using Fonts More Easily in R Graphs
 
-License:          ASL 2.0
+# Main: ASL 2.0
+# src/tidy.h, src/utf8.c and src/utf8.h: libpng/zlib
+License:          ASL 2.0 and zlib
 URL:              https://cran.r-project.org/web/packages/%{packname}/index.html
 Source0:          https://cran.r-project.org/src/contrib/%{packname}_%{packvers}.tar.gz
 
@@ -52,6 +54,13 @@ this package.
 %prep
 %setup -q -c -n %{packname}
 
+# Fix line endings.
+for file in %{packname}/inst/doc/introduction.R %{packname}/inst/doc/introduction.Rmd; do
+    sed "s|\r||g" ${file} > ${file}.new
+    touch -r ${file} ${file}.new
+    mv ${file}.new ${file}
+done
+
 
 %build
 
@@ -78,7 +87,7 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} --ignore-vignettes
 %{rlibdir}/%{packname}/DESCRIPTION
 %doc %{rlibdir}/%{packname}/NEWS.Rd
 %doc %{rlibdir}/%{packname}/AUTHORS
-%doc %{rlibdir}/%{packname}/COPYRIGHTS
+%license %{rlibdir}/%{packname}/COPYRIGHTS
 %{rlibdir}/%{packname}/INDEX
 %{rlibdir}/%{packname}/NAMESPACE
 %{rlibdir}/%{packname}/Meta
@@ -89,5 +98,9 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} --ignore-vignettes
 
 
 %changelog
+* Tue Jun 05 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.5.1-2
+- Fix license tagging
+- Fix file line endings
+
 * Thu May 31 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.5.1-1
 - initial package for Fedora