mizdebsk pushed to checkstyle (master). "Update to upstream version 6.4"

[notifications at fedoraproject.org]

>From 6c878ea4579f91100c2e6eeff938fe4c6e0ae5ef Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Thu, 26 Mar 2015 11:12:26 +0100
Subject: Update to upstream version 6.4


diff --git a/.gitignore b/.gitignore
index 7a959ee..f85681f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ checkstyle-5.5-src.tar.gz
 /checkstyle-5.7-src.tar.gz
 /checkstyle-5.8-src.tar.gz
 /checkstyle-6.3-src.tar.gz
+/checkstyle-6.4-src.tar.gz
diff --git a/checkstyle.spec b/checkstyle.spec
index 094a14d..542e235 100644
--- a/checkstyle.spec
+++ b/checkstyle.spec
@@ -29,7 +29,7 @@
 #
 
 Name:           checkstyle
-Version:        6.3
+Version:        6.4
 Release:        1%{?dist}
 Summary:        Java source code checker
 URL:            http://checkstyle.sourceforge.net/
@@ -58,23 +58,13 @@ BuildRequires:  mvn(org.codehaus.mojo:antlr-maven-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 
 Obsoletes:      %{name}-optional < %{version}-%{release}
-# revisit later, maybe manual will come back when change from ant to
-# maven build system will settle down
+Obsoletes:      %{name}-demo < %{version}-%{release}
 Obsoletes:      %{name}-manual < %{version}-%{release}
 
 %description
 A tool for checking Java source code for adherence to a set of rules.
 
-%package        demo
-Group:          Development/Tools
-Summary:        Demos for %{name}
-Requires:       %{name} = %{version}-%{release}
-
-%description    demo
-Demonstrations and samples for %{name}.
-
 %package        javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
 
 %description    javadoc
@@ -126,10 +116,6 @@ install -Dm 644 %{SOURCE2} %{buildroot}%{_datadir}/xml/%{name}/catalog
 cp -pa src/main/resources/com/puppycrawl/tools/checkstyle/*.dtd \
   %{buildroot}%{_datadir}/xml/%{name}
 
-# demo
-install -dm 755 %{buildroot}%{_datadir}/%{name}
-cp -par contrib/* %{buildroot}%{_datadir}/%{name}
-
 # ant.d
 install -dm 755  %{buildroot}%{_sysconfdir}/ant.d
 cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
@@ -158,14 +144,15 @@ fi
 %{_bindir}/%{name}
 %config(noreplace) %{_sysconfdir}/ant.d/%{name}
 
-%files demo
-%{_datadir}/%{name}
-
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE
 
 
 %changelog
+* Thu Mar 26 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 6.4-1
+- Update to upstream version 6.4
+- Remove demo subpackage
+
 * Wed Feb 18 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 6.3-1
 - Update to upstream version 6.3
 
diff --git a/sources b/sources
index f006664..6adca22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd4872f34be24e4c986103fc7bb99487  checkstyle-6.3-src.tar.gz
+dc2bf4db05b566f28dbfb4bad1fefd05  checkstyle-6.4-src.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/checkstyle.git/commit/?h=master&id=6c878ea4579f91100c2e6eeff938fe4c6e0ae5ef