From 361f2da6f8e94d9f340816dba2e59c1f04e5803d Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Oct 13 2014 06:46:48 +0000
Subject: Update to upstream version 5.8


---

diff --git a/.gitignore b/.gitignore
index cc633ac..8fc9621 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ checkstyle-src-5.1.tar.gz
 checkstyle-5.5-src.tar.gz
 /checkstyle-5.6-src.tar.gz
 /checkstyle-5.7-src.tar.gz
+/checkstyle-5.8-src.tar.gz
diff --git a/checkstyle.spec b/checkstyle.spec
index 6c34906..06f6d79 100644
--- a/checkstyle.spec
+++ b/checkstyle.spec
@@ -29,8 +29,8 @@
 #
 
 Name:           checkstyle
-Version:        5.7
-Release:        3%{?dist}
+Version:        5.8
+Release:        1%{?dist}
 Summary:        Java source code checker
 URL:            http://checkstyle.sourceforge.net/
 # src/checkstyle/com/puppycrawl/tools/checkstyle/grammars/java.g is GPLv2+
@@ -103,7 +103,7 @@ sed -i s/guava-jdk5/guava/ pom.xml
 %pom_add_dep com.sun:tools
 
 # fix encoding issues in docs
-sed -i 's/\r//' LICENSE LICENSE.apache20 README.textile RIGHTS.antlr \
+sed -i 's/\r//' LICENSE LICENSE.apache20 README.md RIGHTS.antlr \
          checkstyle_checks.xml sun_checks.xml suppressions.xml \
          contrib/hooks/*.pl src/site/resources/css/*css \
          java.header
@@ -124,7 +124,7 @@ rm -f src/tests/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.j
 
 # dtds
 install -Dm 644 %{SOURCE2} %{buildroot}%{_datadir}/xml/%{name}/catalog
-cp -pa src/checkstyle/com/puppycrawl/tools/checkstyle/*.dtd \
+cp -pa src/main/resources/com/puppycrawl/tools/checkstyle/*.dtd \
   %{buildroot}%{_datadir}/xml/%{name}
 
 # javadoc
@@ -158,7 +158,7 @@ if [ -x %{_bindir}/install-catalog -a -d %{_sysconfdir}/sgml ]; then
 fi
 
 %files -f .mfiles
-%doc LICENSE README.textile
+%doc LICENSE README.md
 %doc checkstyle_checks.xml java.header sun_checks.xml suppressions.xml
 %{_datadir}/xml/%{name}
 %{_bindir}/%{name}
@@ -172,6 +172,9 @@ fi
 
 
 %changelog
+* Mon Oct 13 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.8-1
+- Update to upstream version 5.8
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index b9d9d9f..b87a367 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-076314bd9bf08812b1f0ff0af913dee9  checkstyle-5.7-src.tar.gz
+b3112b6cf76a2542d9a37f207e826a7c  checkstyle-5.8-src.tar.gz