[codenarc] fix log4j12 classpath/version

[gil]

commit 2f3068c2d6b0fce5982dc9aeb1e58fad994d093e
Author: gil <puntogil at libero.it>
Date:   Thu Nov 13 11:21:36 2014 +0100

    fix log4j12 classpath/version

 codenarc-0.17-build.xml           |    2 +-
 codenarc-0.17-enable-gmaven.patch |   68 -------------------------------
 codenarc.spec                     |   81 +++++++++----------------------------
 3 files changed, 20 insertions(+), 131 deletions(-)
---
diff --git a/codenarc-0.17-build.xml b/codenarc-0.17-build.xml
index cb15aa6..579e454 100644
--- a/codenarc-0.17-build.xml
+++ b/codenarc-0.17-build.xml
@@ -9,7 +9,7 @@
     <fileset dir="/usr/share/java" includes="ant.jar"/>
     <fileset dir="/usr/share/java" includes="cobertura.jar"/>
     <fileset dir="/usr/share/java" includes="GMetrics.jar"/>
-    <fileset dir="/usr/share/java" includes="log4j12-12.jar"/>
+    <fileset dir="/usr/share/java" includes="log4j12-1.2.17.jar"/>
    </path>
    
    <path id="groovyc.classpath">
diff --git a/codenarc.spec b/codenarc.spec
index 712ecae..ced320d 100644
--- a/codenarc.spec
+++ b/codenarc.spec
@@ -1,8 +1,7 @@
 %global oname CodeNarc
-%global with_gmaven 0
 Name:          codenarc
 Version:       0.17
-Release:       8%{?dist}
+Release:       9%{?dist}
 Summary:       Groovy library that provides static analysis features for Groovy code
 License:       ASL 2.0
 Url:           http://codenarc.sourceforge.net/
@@ -12,12 +11,10 @@ Source2:       codenarc-%{version}-build.properties
 # remove @Override
 # unavailable method in groovy 1.8.x (...)
 Patch1:        codenarc-0.17-groovy18.patch
-# replace runtime 1.7 witn runtime 1.8
-# add groovy-all deps
-Patch2:        codenarc-0.17-enable-gmaven.patch
 
 BuildRequires: java-devel
-BuildRequires: jpackage-utils
+BuildRequires: java-javadoc
+BuildRequires: javapackages-local
 
 BuildRequires: antlr
 BuildRequires: apache-commons-cli
@@ -29,31 +26,6 @@ BuildRequires: gmetrics
 BuildRequires: groovy-lib >= 1.8.9-16
 BuildRequires: log4j12
 
-%if %with_gmaven
-# https://bugzilla.redhat.com/show_bug.cgi?id=841833
-BuildRequires: gmaven
-BuildRequires: maven
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit
-# test deps
-BuildRequires: junit
-
-%endif
-
-Requires:      ant
-Requires:      cobertura
-Requires:      gmetrics
-Requires:      groovy
-Requires:      log4j12
-
-Requires:      java-headless
-Requires:      jpackage-utils
 BuildArch:     noarch
 
 %description
@@ -67,10 +39,10 @@ of the number of violations per package and for the whole
 project.
 
 %package javadoc
-Summary:       Groovydoc for %{name}
+Summary:       Javadoc for %{name}
 
 %description javadoc
-This package contains groovydoc for %{name}.
+This package contains javadoc for %{name}.
 
 %prep
 %setup -q -n %{oname}-%{version}
@@ -81,55 +53,40 @@ rm -rf docs/*
 
 %patch1 -p1
 
-
-%if !%with_gmaven
-# in fedora haven't gmaven yet
+# in fedora haven't gmaven yet. https://bugzilla.redhat.com/show_bug.cgi?id=841833
 cp -pr %{SOURCE1} build.xml
 cp -pr %{SOURCE2} build.properties
-%else
-%patch2 -p0
-%endif
+
 
 chmod 644 README.txt
 for d in CHANGELOG.txt LICENSE.txt NOTICE.txt README.txt ; do
   sed -i 's/\r//' $d
 done
 
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId='log4j']/pom:version" 1.2.17
+
+%pom_remove_plugin org.codehaus.gmaven:gmaven-plugin
+
 %build
 
-%if !%with_gmaven
+%mvn_file org.%{name}:%{oname} %{name} %{oname}
 ant
-%else
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.failure.ignore=true install javadoc:aggregate
-%endif
+%mvn_artifact pom.xml target/%{oname}-%{version}.jar
 
 %install
-
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 target/%{oname}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-
-(
-  cd %{buildroot}%{_javadir}
-  ln -sf %{name}.jar %{oname}.jar
-)
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_install -J target/site/apidocs
 
 %files -f .mfiles
-%{_javadir}/%{oname}.jar
 %doc CHANGELOG.txt LICENSE.txt NOTICE.txt README.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Thu Nov 13 2014 gil cattaneo <puntogil at libero.it> 0.17-9
+- fix log4j12 classpath/version
+- remove (g)maven references
+
 * Thu Nov 13 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.17-8
 - Remove POM patch changing artifactId from groovy-all to groovy