[jboss-logmanager/f17] - Upstream release 1.2.2.GA - Cleanup in spec file - Relocated jars to _javadir

[Marek Goldmann]

commit 38f4599658045b4c36cbc03a5d2322ecdba91089
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Tue Mar 6 17:05:47 2012 +0100

    - Upstream release 1.2.2.GA
    - Cleanup in spec file
    - Relocated jars to _javadir

 .gitignore            |    1 +
 jboss-logmanager.spec |   32 ++++++++++++++++----------------
 sources               |    2 +-
 3 files changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5f4633f..cdb843b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jboss-logmanager-1.2.0.GA.tar.xz
+/jboss-logmanager-1.2.2.GA.tar.xz
diff --git a/jboss-logmanager.spec b/jboss-logmanager.spec
index dc3e684..78c99da 100644
--- a/jboss-logmanager.spec
+++ b/jboss-logmanager.spec
@@ -2,17 +2,16 @@
 %global namedversion %{version}%{?namedreltag}
 
 Name:             jboss-logmanager
-Version:          1.2.0
-Release:          2%{?dist}
+Version:          1.2.2
+Release:          1%{?dist}
 Summary:          JBoss Log Manager
 Group:            Development/Libraries
 License:          LGPLv2+
 URL:              https://github.com/jboss-logging/jboss-logmanager
 
 # git clone git://github.com/jboss-logging/jboss-logmanager.git
-# cd jboss-logmanager/ && git archive --format=tar --prefix=jboss-logmanager-1.2.0.GA/ 1.2.0.GA | xz > jboss-logmanager-1.2.0.GA.tar.xz
+# cd jboss-logmanager/ && git archive --format=tar --prefix=jboss-logmanager-1.2.2.GA/ 1.2.2.GA | xz > jboss-logmanager-1.2.2.GA.tar.xz
 Source0:          %{name}-%{namedversion}.tar.xz
-Patch0:           %{name}-%{namedversion}-testng.patch
 
 BuildArch:        noarch
 
@@ -27,9 +26,8 @@ BuildRequires:    maven-javadoc-plugin
 BuildRequires:    maven-release-plugin
 BuildRequires:    maven-resources-plugin
 BuildRequires:    maven-surefire-plugin
-# https://bugzilla.redhat.com/show_bug.cgi?id=725991
-# BuildRequires:    testng
-# BuildRequires:    maven-surefire-provider-testng
+BuildRequires:    testng
+BuildRequires:    maven-surefire-provider-testng
 BuildRequires:    qdox
 BuildRequires:    jboss-parent
 
@@ -49,28 +47,25 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{namedversion}
-# https://bugzilla.redhat.com/show_bug.cgi?id=725991
-%patch0 -p1
 
 %build
-# Skipped tests because of java.lang.NoClassDefFoundError: com/thoughtworks/qdox/model/AbstractInheritableJavaEntity
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
+mvn-rpmbuild install javadoc:aggregate
 
 %install
 # JAR
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/jboss
-cp -p target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/jboss/%{name}.jar
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+cp -p target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # APIDOCS
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # POM
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.jboss-%{name}.pom
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
 # DEPMAP
-%add_maven_depmap JPP.jboss-%{name}.pom jboss/%{name}.jar
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %files
 %{_mavenpomdir}/*
@@ -83,6 +78,11 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.jboss-%{name}.pom
 %doc COPYING.txt
 
 %changelog
+* Sun Mar 04 2012 Marek Goldmann <mgoldman at redhat.com> 1.2.2-1
+- Upstream release 1.2.2.GA
+- Cleanup in spec file
+- Relocated jars to _javadir
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 3e2edb2..0cf1162 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f3839eb30770c501dc85e2a29086b35  jboss-logmanager-1.2.0.GA.tar.xz
+056883dacea5aaafcd0558c2543e9871  jboss-logmanager-1.2.2.GA.tar.xz