From c71aa7b949a10624bf901d5369bddc49f91e3d50 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@gmail.com>
Date: Tue, 26 Feb 2013 12:27:34 +0100
Subject: [PATCH] - Upstream release 3.1.2.GA - Move to mvn_build and
 mvn_install macros - License change to ASL 2.0

---
 .gitignore         |  1 +
 jboss-logging.spec | 44 +++++++++++++++++---------------------------
 sources            |  2 +-
 3 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5716ff3..8e18232 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /jboss-logging-3.0.1.GA.tar.xz
 /jboss-logging-3.1.0.CR1.tar.xz
 /jboss-logging-3.1.0.GA.tar.xz
+/jboss-logging-3.1.2.GA.tar.xz
diff --git a/jboss-logging.spec b/jboss-logging.spec
index 8c88eac..bfeef27 100644
--- a/jboss-logging.spec
+++ b/jboss-logging.spec
@@ -2,16 +2,16 @@
 %global namedversion %{version}%{?namedreltag}
 
 Name:             jboss-logging
-Version:          3.1.0
-Release:          6%{?dist}
+Version:          3.1.2
+Release:          1%{?dist}
 Summary:          The JBoss Logging Framework
 Group:            Development/Libraries
-License:          LGPLv2+
+License:          ASL 2.0
 URL:              https://github.com/jboss-logging/jboss-logging
 
 # git clone git://github.com/jboss-logging/jboss-logging.git
-# cd jboss-logging/ && git archive --format=tar --prefix=jboss-logging-3.1.0.GA/ 3.1.0.GA | xz > jboss-logging-3.1.0.GA.tar.xz
-Source0:          %{name}-%{namedversion}.tar.xz
+# cd jboss-logging/ && git archive --format=tar --prefix=jboss-logging-3.1.2.GA/ 3.1.2.GA | xz > jboss-logging-3.1.2.GA.tar.xz
+Source0:          jboss-logging-%{namedversion}.tar.xz
 
 BuildArch:        noarch
 
@@ -52,36 +52,26 @@ Requires:         jpackage-utils
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{namedversion}
+%setup -q -n jboss-logging-%{namedversion}
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build -f
 
 %install
-# JAR
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%mvn_install
 
-# APIDOCS
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%files -f .mfiles
+%doc src/main/resources/META-INF/LICENSE.txt
 
-#POM
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-# DEPMAP
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc src/main/resources/META-INF/LICENSE.txt
 
 %changelog
+* Tue Feb 26 2013 Marek Goldmann <mgoldman@redhat.com> - 3.1.2-1
+- Upstream release 3.1.2.GA
+- Move to mvn_build and mvn_install macros
+- License change to ASL 2.0
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index ac03f86..2766c89 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ed189d29d2d08d8bd8a3e66b101af7fb  jboss-logging-3.1.0.GA.tar.xz
+85f06d905a7ef2e2ef86cac12ab87e39  jboss-logging-3.1.2.GA.tar.xz