[checkstyle] Update to upstream version 5.7

Mikolaj Izdebski mizdebsk at fedoraproject.org
Mon May 12 06:02:09 UTC 2014


commit f35f8b5584fbf813390e72c9f5f809e748af4ec8
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon May 12 07:51:54 2014 +0200

    Update to upstream version 5.7

 .gitignore                                |    1 +
 0001-Turn-of-javadoc-postprocessing.patch |   25 -------------------------
 checkstyle.spec                           |   19 +++++++++----------
 sources                                   |    2 +-
 4 files changed, 11 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e870546..cc633ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ checkstyle-src-5.1.tar.gz
 /checkstyle-5.4-src.tar.gz
 checkstyle-5.5-src.tar.gz
 /checkstyle-5.6-src.tar.gz
+/checkstyle-5.7-src.tar.gz
diff --git a/checkstyle.spec b/checkstyle.spec
index c904487..674ae47 100644
--- a/checkstyle.spec
+++ b/checkstyle.spec
@@ -29,8 +29,8 @@
 #
 
 Name:           checkstyle
-Version:        5.6
-Release:        9%{?dist}
+Version:        5.7
+Release:        1%{?dist}
 Summary:        Java source code checker
 URL:            http://checkstyle.sourceforge.net/
 # src/checkstyle/com/puppycrawl/tools/checkstyle/grammars/java.g is GPLv2+
@@ -40,10 +40,6 @@ Group:          Development/Tools
 Source0:        http://download.sf.net/checkstyle/checkstyle-%{version}-src.tar.gz
 Source2:        %{name}.catalog
 
-# Fix NPE in ant during build (#1049902)
-Patch1:         0001-Turn-of-javadoc-postprocessing.patch
-
-
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  antlr-maven-plugin
 BuildRequires:  apache-commons-beanutils
@@ -91,10 +87,10 @@ API documentation for %{name}.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch1 -p1
-
 %pom_remove_parent
 
+sed -i s/guava-jdk5/guava/ pom.xml
+
 # not needed for package build
 %pom_remove_plugin :maven-eclipse-plugin
 
@@ -108,7 +104,7 @@ API documentation for %{name}.
 %pom_add_dep com.sun:tools
 
 # fix encoding issues in docs
-sed -i 's/\r//' LICENSE LICENSE.apache20 README RIGHTS.antlr \
+sed -i 's/\r//' LICENSE LICENSE.apache20 README.textile RIGHTS.antlr \
          checkstyle_checks.xml sun_checks.xml suppressions.xml \
          contrib/hooks/*.pl src/site/resources/css/*css \
          java.header
@@ -163,7 +159,7 @@ if [ -x %{_bindir}/install-catalog -a -d %{_sysconfdir}/sgml ]; then
 fi
 
 %files -f .mfiles
-%doc LICENSE README
+%doc LICENSE README.textile
 %doc checkstyle_checks.xml java.header sun_checks.xml suppressions.xml
 %{_datadir}/xml/%{name}
 %{_bindir}/%{name}
@@ -177,6 +173,9 @@ fi
 
 
 %changelog
+* Mon May 12 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 5.7-1
+- Update to upstream version 5.7
+
 * Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky at redhat.com> - 5.6-9
 - Use Requires: java-headless rebuild (#1067528)
 
diff --git a/sources b/sources
index 58c5fe9..b9d9d9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3582621836de28b553197b30113cddaf  checkstyle-5.6-src.tar.gz
+076314bd9bf08812b1f0ff0af913dee9  checkstyle-5.7-src.tar.gz


More information about the scm-commits mailing list