commit 5bb7de5d5c8441a0f188f31f3e6128640f300e5c Merge: ac2711e 7df48f5 Author: Mikolaj Izdebski mizdebsk@redhat.com Date: Thu Mar 6 11:39:11 2014 +0100
Merge branch 'rhbz1015123'
Conflicts: maven-release.spec
maven-release-ftbfs.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ maven-release.spec | 7 +++++++ 2 files changed, 49 insertions(+), 0 deletions(-) --- diff --cc maven-release.spec index 0a1c492,07d0230..28b562d --- a/maven-release.spec +++ b/maven-release.spec @@@ -94,9 -98,9 +98,12 @@@ EO %doc LICENSE NOTICE
%changelog +* Tue Mar 04 2014 Stanislav Ochotnicky sochotnicky@redhat.com - 2.2.1-10 +- Use Requires: java-headless rebuild (#1067528) + + * Wed Jan 08 2014 pcpa paulo.cesar.pereira.de.andrade@gmail.com - 2.2.1-10 + - fix rhbz#1015123 + * Mon Aug 12 2013 gil cattaneo puntogil@libero.it 2.2.1-9 - fix rhbz#984875, rhbz#992200 - fix some rpmlint problems