[checkstyle] Patch eclipse plugin out to simplify BR

[Stanislav Ochotnicky]

commit 0f2cb0a0bc830c81653dabab1f81b79d961e2cbd
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Apr 18 18:11:14 2012 +0200

    Patch eclipse plugin out to simplify BR
    
    - Cleanup and sort requires

 0003-Remove-eclipse-plugin.patch |   32 ++++++++++++++++++++++++
 checkstyle.spec                  |   49 +++++++++++++++++--------------------
 2 files changed, 55 insertions(+), 26 deletions(-)
---
diff --git a/0003-Remove-eclipse-plugin.patch b/0003-Remove-eclipse-plugin.patch
new file mode 100644
index 0000000..88b9d6c
--- /dev/null
+++ b/0003-Remove-eclipse-plugin.patch
@@ -0,0 +1,32 @@
+From db654c5cc1ae5bba604b5dea52da165d5354c6cb Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Wed, 18 Apr 2012 17:40:16 +0200
+Subject: [PATCH 3/3] Remove eclipse plugin
+
+---
+ pom.xml |    9 ---------
+ 1 files changed, 0 insertions(+), 9 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index c977bd0..f454af2 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -366,15 +366,6 @@
+         </configuration>
+       </plugin>
+ 
+-      <plugin>
+-      	<groupId>org.apache.maven.plugins</groupId>
+-      	<artifactId>maven-eclipse-plugin</artifactId>
+-        <version>2.8</version>
+-        <configuration>
+-          <downloadSources>true</downloadSources>
+-          <downloadJavadocs>true</downloadJavadocs>
+-        </configuration>
+-      </plugin>
+     </plugins>
+   </build>
+ 
+-- 
+1.7.7.6
+
diff --git a/checkstyle.spec b/checkstyle.spec
index 9bd466d..6e512ef 100644
--- a/checkstyle.spec
+++ b/checkstyle.spec
@@ -30,7 +30,7 @@
 
 Name:           checkstyle
 Version:        5.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java source code checker
 URL:            http://checkstyle.sourceforge.net/
 # src/checkstyle/com/puppycrawl/tools/checkstyle/grammars/java.g is GPLv2+
@@ -46,12 +46,21 @@ Patch0:         0001-Remove-sonatype-parent.patch
 # not available in Fedora yet
 Patch1:         0002-Remove-linkcheck-plugin.patch
 
+# get rid of eclipse dependency
+Patch2:         0003-Remove-eclipse-plugin.patch
+
+
 BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  maven
 BuildRequires:  antlr-maven-plugin
+BuildRequires:  apache-commons-beanutils
+BuildRequires:  apache-commons-cli
+BuildRequires:  apache-commons-logging
+BuildRequires:  guava
+BuildRequires:  junit
+BuildRequires:  maven
 BuildRequires:  maven-antrun-plugin
 BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-eclipse-plugin
+BuildRequires:  maven-enforcer-plugin
 BuildRequires:  maven-install-plugin
 BuildRequires:  maven-jar-plugin
 BuildRequires:  maven-javadoc-plugin
@@ -61,30 +70,13 @@ BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-site-plugin
 BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-surefire-provider-junit4
-BuildRequires:  maven-enforcer-plugin
-BuildRequires:  apache-commons-beanutils
-BuildRequires:  apache-commons-cli
-BuildRequires:  apache-commons-logging
-BuildRequires:  apache-commons-collections
-BuildRequires:  xerces-j2
-BuildRequires:  jdom
-BuildRequires:  velocity
-BuildRequires:  emma
-BuildRequires:  junit4
-BuildRequires:  guava
 
-Requires:       java
-Requires:       apache-commons-cli
+Requires:       java-devel
+Requires:       jpackage-utils
+Requires:       antlr-tool
 Requires:       apache-commons-beanutils
-Requires:       apache-commons-collections
+Requires:       apache-commons-cli
 Requires:       apache-commons-logging
-Requires:       jaxp_parser_impl
-Requires:       antlr >= 0:2.7.1
-Requires:       xalan-j2
-Requires:       xerces-j2
-Requires:       jdom
-Requires:       velocity
-Requires:       jpackage-utils
 Requires:       guava
 
 BuildArch:      noarch
@@ -117,6 +109,7 @@ API documentation for %{name}.
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # fix encoding issues in docs
 sed -i 's/\r//' LICENSE LICENSE.apache20 README RIGHTS.antlr \
@@ -140,7 +133,7 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-checkstyle.pom
 
 
 # script
-%jpackage_script com.puppycrawl.tools.checkstyle.Main "" "" checkstyle:antlr:regexp:apache-commons-beanutils:apache-commons-cli:apache-commons-logging:guava:jaxp_parser_impl checkstyle true
+%jpackage_script com.puppycrawl.tools.checkstyle.Main "" "" checkstyle:antlr:apache-commons-beanutils:apache-commons-cli:apache-commons-logging:guava checkstyle true
 
 # dtds
 install -Dm 644 %{SOURCE2} %{buildroot}%{_datadir}/xml/%{name}/catalog
@@ -158,7 +151,7 @@ cp -par contrib/* %{buildroot}%{_datadir}/%{name}
 # ant.d
 install -dm 755  %{buildroot}%{_sysconfdir}/ant.d
 cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
-checkstyle antlr regexp apache-commons-beanutils apache-commons-cli apache-commons-logging guava jaxp_parser_impl
+checkstyle antlr apache-commons-beanutils apache-commons-cli apache-commons-logging guava
 EOF
 
 %pre javadoc
@@ -200,6 +193,10 @@ fi
 
 
 %changelog
+* Wed Apr 18 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 5.5-3
+- Patch eclipse plugin out to simplify BR
+- Cleanup and sort requires
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild