[h2: 1/2] Update to latest upstream.

[Alexander Kurtakov]

commit a7def3c309d73598633d89955d43ab431eb49227
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Jul 23 21:41:01 2012 +0300

    Update to latest upstream.

 .gitignore              |    2 ++
 fix-build.patch         |   24 ++++++++----------------
 fix-for-servlet25.patch |   21 ---------------------
 h2.spec                 |   28 +++++++++++++---------------
 sources                 |    2 +-
 5 files changed, 24 insertions(+), 53 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 610d28d..cd1a8d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /h2-2010-11-02.zip
 /h2-2010-11-21.zip
+h2-2011-12-30.zip
+h2-2012-07-13.zip
diff --git a/fix-build.patch b/fix-build.patch
index 5af9f8a..a6dd069 100644
--- a/fix-build.patch
+++ b/fix-build.patch
@@ -1,6 +1,6 @@
---- Build.java.orig	2011-02-18 14:45:31.524646333 -0600
-+++ Build.java	2011-02-18 14:58:03.517039396 -0600
-@@ -143,12 +143,11 @@
+--- Build.java.sav	2012-07-13 17:04:34.000000000 +0300
++++ Build.java	2012-07-23 11:47:00.693965953 +0300
+@@ -150,12 +150,11 @@ public class Build extends BuildBase {
          switchSource(debugInfo);
          clean();
          mkdir("temp");
@@ -8,20 +8,12 @@
          String classpath = "temp" +
 -                File.pathSeparator + "ext/servlet-api-2.4.jar" +
 -                File.pathSeparator + "ext/" + getLuceneJar() +
--                File.pathSeparator + "ext/slf4j-api-1.5.0.jar" +
+-                File.pathSeparator + "ext/slf4j-api-1.6.0.jar" +
 -                File.pathSeparator + "ext/org.osgi.core-1.2.0.jar" +
-+                File.pathSeparator + "/usr/share/java/servlet.jar" +
-+                File.pathSeparator + "/usr/share/java/lucene.jar" +
-+                File.pathSeparator + "/usr/share/java/slf4j/api.jar" +
-+                File.pathSeparator + "/usr/share/java/felix/org.osgi.core.jar" +
++        		File.pathSeparator + "/usr/share/java/servlet.jar" +
++        		File.pathSeparator + "/usr/share/java/lucene.jar" +
++        		File.pathSeparator + "/usr/share/java/slf4j/api.jar" +
++        		File.pathSeparator + "/usr/share/java/felix/org.osgi.core.jar" +
                  File.pathSeparator + System.getProperty("java.home") + "/../lib/tools.jar";
          FileList files;
          if (clientOnly) {
-@@ -212,7 +211,6 @@
-         java("org.h2.build.doc.WebSite", null);
-         java("org.h2.build.doc.LinkChecker", null);
-         java("org.h2.build.doc.XMLChecker", null);
--        java("org.h2.build.doc.SpellChecker", null);
-         java("org.h2.build.code.CheckTextFiles", null);
-         beep();
-     }
diff --git a/h2.spec b/h2.spec
index f6eac0e..66568ef 100644
--- a/h2.spec
+++ b/h2.spec
@@ -1,22 +1,20 @@
 Name:           h2
-Version:        1.2.147
-Release:        4%{?dist}
+Version:        1.3.168
+Release:        1%{?dist}
 Summary:        Java SQL database
 
 Group:          Development/Libraries
 License:        EPL
 URL:            http://www.h2database.com
-Source0:        http://www.h2database.com/h2-2010-11-21.zip
-Patch0:         fix-for-servlet25.patch
+Source0:        http://www.h2database.com/h2-2012-07-13.zip
 Patch1:         fix-build.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: java-devel >= 1:1.5.0
 BuildRequires:  ant
 BuildRequires:  lucene >= 2.4
 BuildRequires:  slf4j >= 1.5
 BuildRequires:  felix-osgi-core >= 1.2
-BuildRequires:  servlet25
+BuildRequires:  servlet3
 Requires: java >= 1:1.5.0
 
 %description
@@ -37,11 +35,12 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{name}
 pushd src/test/org/h2/test/unit
-%patch0
+rm -fr TestServlet.java
 popd
 pushd src/tools/org/h2/build
-%patch1
+%patch1 
 popd
+find -name '*.orig' -exec rm -f '{}' \;
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 
@@ -51,8 +50,6 @@ chmod u+x build.sh
 ./build.sh jar docs
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p bin/h2-%{version}.jar   \
 $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
@@ -61,20 +58,21 @@ mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -rp docs/javadoc  \
 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %doc src/docsrc/html/license.html
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 %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.
+
 * 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
 
diff --git a/sources b/sources
index 7a2f1f5..2d9077a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-47fd194e016be7ac2b73446c080de10e  h2-2010-11-21.zip
+6fa2b923d852f53aaa11780dd84fba88  h2-2012-07-13.zip