[rpms/jansi-native] epel10: Merge commit '154bb699f693743c066e7912e23a90f65a8eec0b'

[rpms/jansi-native] epel10: Merge commit '154bb699f693743c066e7912e23a90f65a8eec0b'

[Mikolaj Izdebski]

            A new commit has been pushed.

            Repo   : rpms/jansi-native
            Branch : epel10
            Commit : 9e4368e59c24883e1acc3dd2085a334e8e46c44e
            Author : Mikolaj Izdebski <mizdebsk@redhat.com>
            Date   : 2014-03-06T14:59:52+01:00
            Stats  : +8/-0 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/jansi-native/c/9e4368e59c24883e1acc3dd2085a334e8e46c44e?branch=epel10

            Log:
            Merge commit '154bb699f693743c066e7912e23a90f65a8eec0b'

Conflicts:
	jansi-native.spec

---
diff --git a/jansi-native.spec b/jansi-native.spec
index d861515..fcc2dea 100644
--- a/jansi-native.spec
+++ b/jansi-native.spec
@@ -46,6 +46,7 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n jansi-native-jansi-native-%{version}
+%mvn_package :::linux%{bits}:
 
 %build
 %mvn_build
@@ -64,6 +65,10 @@ This package contains the API documentation for %{name}.
 * Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.5-4
 - Use Requires: java-headless rebuild (#1067528)
 
+* Fri Jan 10 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5-4
+- Install attached artifacts
+- Resolves: rhbz#1028550
+
 * Tue Nov 26 2013 Marek Goldmann <mgoldman@redhat.com> - 1.5-3
 - Mark javadoc subpackage as noarch
 

diff --git a/jansi-native.spec b/jansi-native.spec
index 6fe1f19..fcc2dea 100644
--- a/jansi-native.spec
+++ b/jansi-native.spec
@@ -62,6 +62,9 @@ This package contains the API documentation for %{name}.
 %doc license.txt
 
 %changelog
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.5-4
+- Use Requires: java-headless rebuild (#1067528)
+
 * Fri Jan 10 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5-4
 - Install attached artifacts
 - Resolves: rhbz#1028550