[h2: 2/2] Merge branch 'master' of ssh://akurtakov at pkgs.fedoraproject.org/h2.git

[Alexander Kurtakov]

commit 02075d7981b7c96f50bf7e13ed7e19ebfa8512a6
Merge: a7def3c 8d36c76
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Jul 23 21:50:13 2012 +0300

    Merge branch 'master' of ssh://akurtakov@pkgs.fedoraproject.org/h2.git
    
    Conflicts:
    	h2.spec

 h2.spec |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
---
diff --cc h2.spec
index 66568ef,7c936b4..d359c35
--- a/h2.spec
+++ b/h2.spec
@@@ -58,8 -64,18 +58,14 @@@ mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/
  cp -rp docs/javadoc  \
  $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
+ mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+ cp -rp %SOURCE1 $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+ %add_maven_depmap JPP-%{name}.pom %{name}.jar
+ 
 -%clean
 -rm -rf $RPM_BUILD_ROOT
 -
  %files
 -%defattr(-,root,root,-)
  %{_javadir}/*
+ %{_mavenpomdir}/*
+ %{_mavendepmapfragdir}/*
  %doc src/docsrc/html/license.html
  
  %files javadoc
@@@ -67,11 -84,14 +73,17 @@@
  %doc src/docsrc/html/license.html
  
  %changelog
 +* Mon Jul 23 2012 Alexander Kurtakov <akurtako at redhat.com> 1.3.168-1
 +- Update to latest upstream.
 +
- * Sat Jan 14 2012 Alexander Kurtakov <akurtako at redhat.com> 1.3.163-1
- - Update to new upstream release.
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.147-7
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Thu Mar  8 2012 Andy Grimm <agrimm at gmail.com> - 1.2.147-6
+ - Add a POM file
+ 
+ * Tue Jan 24 2012 Deepak Bhole <dbhole at redhat.com> - 1.2.147-5
+ - Added patch for JDBC 4.1/Java 7 support (based on upstream patch)
  
  * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.147-4
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild