[jboss-logmanager-log4j] Rebuild for log4j upgrade, using xmvn now

[Marek Goldmann]

commit c98a3d829300583d8ea30d932c4091625deb6364
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Jul 1 15:32:31 2014 +0200

    Rebuild for log4j upgrade, using xmvn now

 jboss-logmanager-log4j.spec |   41 +++++++++++++++++------------------------
 1 files changed, 17 insertions(+), 24 deletions(-)
---
diff --git a/jboss-logmanager-log4j.spec b/jboss-logmanager-log4j.spec
index 3efa8ad..2a9f8cb 100644
--- a/jboss-logmanager-log4j.spec
+++ b/jboss-logmanager-log4j.spec
@@ -3,7 +3,7 @@
 
 Name:             jboss-logmanager-log4j
 Version:          1.0.0
-Release:          10%{?dist}
+Release:          11%{?dist}
 Summary:          JBoss LogManager Log4j Compatibility Library 
 Group:            Development/Libraries
 License:          LGPLv2+
@@ -15,7 +15,6 @@ Source0:          %{name}-%{namedversion}.tar.xz
 
 BuildArch:        noarch
 
-BuildRequires:    jpackage-utils
 BuildRequires:    java-devel
 BuildRequires:    maven-local
 BuildRequires:    maven-compiler-plugin
@@ -33,12 +32,14 @@ BuildRequires:    maven-eclipse-plugin
 BuildRequires:    maven-ejb-plugin
 
 BuildRequires:    jboss-parent
-BuildRequires:    log4j
 BuildRequires:    jboss-logmanager
 
-Requires:         jboss-logmanager
-Requires:         log4j
-Requires:         jpackage-utils
+%if 0%{?fedora} >= 21
+BuildRequires:    log4j12
+%else
+BuildRequires:    log4j
+%endif
+
 
 %description
 This package contains JBoss LogManager Log4j Compatibility Library 
@@ -46,7 +47,6 @@ This package contains JBoss LogManager Log4j Compatibility Library
 %package javadoc
 Summary:          Javadocs for %{name}
 Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -54,30 +54,23 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{name}-%{namedversion}
 
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'log4j']/pom:version" 12
+
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%mvn_install
 
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Mon Jun 09 2014 Marek Goldmann <mgoldman at redhat.com> - 1.0.0-11
+- Rebuild for log4j upgrade, using xmvn now
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild