[derby: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/derby

[Mat Booth]

commit b3b4d090a268534430033ad77eb86e8ceac3f781
Merge: ccc97b8 fdabc3e
Author: Mat Booth <mat.booth at redhat.com>
Date:   Tue Jun 10 14:16:32 2014 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/derby

 derby.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc derby.spec
index 3751e0b,ad15af3..8372dad
--- a/derby.spec
+++ b/derby.spec
@@@ -138,18 -173,13 +138,21 @@@ exit 
  %{_unitdir}/%{name}.service
  %attr(755,derby,derby) %{_sharedstatedir}/%{name}
  
 +%files javadoc
 +%doc db-derby-%{version}-src/LICENSE
 +%doc db-derby-%{version}-src/NOTICE
 +%{_javadocdir}/derby
  
  %changelog
 +* Fri Jun 10 2014 Mat Booth <mat.booth at redhat.com> - 10.10.2.0-1
 +- Update to latest upstream version
 +- Fix BR: junit4 -> junit
 +- Install with xmvn
 +- Package javadocs
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.9.1.0-8
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky at redhat.com> - 10.9.1.0-7
  - Use Requires: java-headless rebuild (#1067528)