Merge commit '154bb699f693743c066e7912e23a90f65a8eec0b'

Conflicts:
	jansi-native.spec
This commit is contained in:
Mikolaj Izdebski 2014-03-06 14:59:52 +01:00
commit 9e4368e59c

View File

@ -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