[derby] Update to newer upstream version.
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue Nov 29 13:16:45 UTC 2011
commit 16da420ad7a4c609d8832fcf4d953acaf56272ac
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date: Tue Nov 29 15:16:30 2011 +0200
Update to newer upstream version.
.gitignore | 1 +
derby-10.6.1.0.pom => derby-10.6.2.1.pom | 2 +-
...ject-10.6.1.0.pom => derby-project-10.6.2.1.pom | 2 +-
derby.spec | 37 +++++--------------
..._cs-10.6.1.0.pom => derbyLocale_cs-10.6.2.1.pom | 4 +-
...-10.6.1.0.pom => derbyLocale_de_DE-10.6.2.1.pom | 4 +-
..._es-10.6.1.0.pom => derbyLocale_es-10.6.2.1.pom | 4 +-
..._fr-10.6.1.0.pom => derbyLocale_fr-10.6.2.1.pom | 4 +-
..._hu-10.6.1.0.pom => derbyLocale_hu-10.6.2.1.pom | 4 +-
..._it-10.6.1.0.pom => derbyLocale_it-10.6.2.1.pom | 4 +-
...-10.6.1.0.pom => derbyLocale_ja_JP-10.6.2.1.pom | 4 +-
...-10.6.1.0.pom => derbyLocale_ko_KR-10.6.2.1.pom | 4 +-
..._pl-10.6.1.0.pom => derbyLocale_pl-10.6.2.1.pom | 4 +-
...-10.6.1.0.pom => derbyLocale_pt_BR-10.6.2.1.pom | 4 +-
..._ru-10.6.1.0.pom => derbyLocale_ru-10.6.2.1.pom | 4 +-
...-10.6.1.0.pom => derbyLocale_zh_CN-10.6.2.1.pom | 4 +-
...-10.6.1.0.pom => derbyLocale_zh_TW-10.6.2.1.pom | 4 +-
...client-10.6.1.0.pom => derbyclient-10.6.2.1.pom | 2 +-
derbynet-10.6.1.0.pom => derbynet-10.6.2.1.pom | 4 +-
derbytools-10.6.1.0.pom => derbytools-10.6.2.1.pom | 2 +-
sources | 1 +
21 files changed, 44 insertions(+), 59 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 230226a..da8c470 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
db-derby-10.6.1.0-src.tar.gz
+db-derby-10.6.2.1-src.tar.gz
diff --git a/derby-10.6.1.0.pom b/derby-10.6.2.1.pom
similarity index 98%
rename from derby-10.6.1.0.pom
rename to derby-10.6.2.1.pom
index 713a376..943d5c7 100644
--- a/derby-10.6.1.0.pom
+++ b/derby-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derby</artifactId>
<name>Apache Derby Database Engine and Embedded JDBC Driver</name>
diff --git a/derby-project-10.6.1.0.pom b/derby-project-10.6.2.1.pom
similarity index 99%
rename from derby-project-10.6.1.0.pom
rename to derby-project-10.6.2.1.pom
index 9943244..6dcc29d 100644
--- a/derby-project-10.6.1.0.pom
+++ b/derby-project-10.6.2.1.pom
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
<packaging>pom</packaging>
<name>Apache Derby Project</name>
<description>Apache Derby is an open source relational database implemented entirely in Java.</description>
diff --git a/derby.spec b/derby.spec
index 39a638a..63d4d37 100644
--- a/derby.spec
+++ b/derby.spec
@@ -1,14 +1,13 @@
Name: derby
-Version: 10.6.1.0
-Release: 6%{?dist}
+Version: 10.6.2.1
+Release: 1%{?dist}
Summary: Relational database implemented entirely in Java
Group: Applications/Databases
License: ASL 2.0
URL: http://db.apache.org/derby/
-Source0: http://www.apache.org/dist/db/%{name}/db-%{name}-%{version}/db-%{name}-%{version}-src.tar.gz
+Source0: http://archive.apache.org/dist/db/%{name}/db-%{name}-%{version}/db-%{name}-%{version}-src.tar.gz
Source1: derby-script
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Source10: http://repo1.maven.org/maven2/org/apache/%{name}/derby/%{version}/derby-%{version}.pom
Source11: http://repo1.maven.org/maven2/org/apache/%{name}/derby-project/%{version}/derby-project-%{version}.pom
@@ -31,13 +30,13 @@ Source27: http://repo1.maven.org/maven2/org/apache/%{name}/derbytools/%{ve
BuildRequires: java-devel >= 1.6
BuildRequires: jpackage-utils
-BuildRequires: servletapi5
+BuildRequires: servlet25
BuildRequires: jakarta-oro
BuildRequires: javacc
BuildRequires: junit4
BuildRequires: xalan-j2
BuildRequires: xerces-j2
-BuildRequires: ant-nodeps
+BuildRequires: ant
Requires: java
Requires: jpackage-utils
@@ -59,7 +58,7 @@ find -name '*.jar' -delete
# tools/ant/properties/extrapath.properties
ln -sf $(build-classpath javacc) tools/java/javacc.jar
-ln -sf $(build-classpath servletapi5) \
+ln -sf $(build-classpath servlet25) \
tools/java/geronimo-spec-servlet-2.4-rc4.jar
ln -sf $(build-classpath xalan-j2) tools/java/xalan.jar
ln -sf $(build-classpath oro) tools/java/jakarta-oro-2.0.8.jar
@@ -81,11 +80,10 @@ ant buildjars -Dderby.source.rpm=%{version}
%install
cd db-%{name}-%{version}-src
-rm -rf $RPM_BUILD_ROOT
# Library
install -d $RPM_BUILD_ROOT%{_javadir}/%{name}
-for i in jars/insane/*.jar
+for i in jars/sane/*.jar
do
B=$(basename $i |sed 's/.jar$//')
install -m644 $i $RPM_BUILD_ROOT%{_javadir}/%{name}/$B-%{version}.jar
@@ -149,25 +147,7 @@ install -p -m644 %{SOURCE27} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.derby-derbytools
%add_to_maven_depmap org.apache.derby derbytools %{version} JPP/derby derbytools
-%check
-#TODO
-#ant junit-all
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post
-%update_maven_depmap
-
-
-%postun
-%update_maven_depmap
-
-
%files
-%defattr(-,root,root,-)
%{_bindir}/*
%{_javadir}/%{name}
%doc db-%{name}-%{version}-src/LICENSE
@@ -180,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Nov 29 2011 Alexander Kurtakov <akurtako at redhat.com> 10.6.2.1-1
+- Update to newer upstream version.
+
* Fri Feb 25 2011 Lubomir Rintel <lkundrak at v3.sk> - 10.6.1.0-6
- Fix startup script (Thomas Meyer, #668828)
diff --git a/derbyLocale_cs-10.6.1.0.pom b/derbyLocale_cs-10.6.2.1.pom
similarity index 97%
rename from derbyLocale_cs-10.6.1.0.pom
rename to derbyLocale_cs-10.6.2.1.pom
index 7d9c6c5..81cdc4d 100644
--- a/derbyLocale_cs-10.6.1.0.pom
+++ b/derbyLocale_cs-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derbyLocale_cs</artifactId>
<name>Apache Derby messages: Czech</name>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
<optional>false</optional>
</dependency>
</dependencies>
diff --git a/derbyLocale_de_DE-10.6.1.0.pom b/derbyLocale_de_DE-10.6.2.1.pom
similarity index 97%
rename from derbyLocale_de_DE-10.6.1.0.pom
rename to derbyLocale_de_DE-10.6.2.1.pom
index b7ef8e3..7a0b453 100644
--- a/derbyLocale_de_DE-10.6.1.0.pom
+++ b/derbyLocale_de_DE-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derbyLocale_de_DE</artifactId>
<name>Apache Derby messages: German</name>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
<optional>false</optional>
</dependency>
</dependencies>
diff --git a/derbyLocale_es-10.6.1.0.pom b/derbyLocale_es-10.6.2.1.pom
similarity index 97%
rename from derbyLocale_es-10.6.1.0.pom
rename to derbyLocale_es-10.6.2.1.pom
index 82fc932..a2d6423 100644
--- a/derbyLocale_es-10.6.1.0.pom
+++ b/derbyLocale_es-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derbyLocale_es</artifactId>
<name>Apache Derby messages: Spanish</name>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
<optional>false</optional>
</dependency>
</dependencies>
diff --git a/derbyLocale_fr-10.6.1.0.pom b/derbyLocale_fr-10.6.2.1.pom
similarity index 97%
rename from derbyLocale_fr-10.6.1.0.pom
rename to derbyLocale_fr-10.6.2.1.pom
index e6b5bb7..e532e9e 100644
--- a/derbyLocale_fr-10.6.1.0.pom
+++ b/derbyLocale_fr-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derbyLocale_fr</artifactId>
<name>Apache Derby messages: French</name>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
<optional>false</optional>
</dependency>
</dependencies>
diff --git a/derbyLocale_hu-10.6.1.0.pom b/derbyLocale_hu-10.6.2.1.pom
similarity index 97%
rename from derbyLocale_hu-10.6.1.0.pom
rename to derbyLocale_hu-10.6.2.1.pom
index 9b9c330..5b429e7 100644
--- a/derbyLocale_hu-10.6.1.0.pom
+++ b/derbyLocale_hu-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derbyLocale_hu</artifactId>
<name>Apache Derby messages: Hungarian</name>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
<optional>false</optional>
</dependency>
</dependencies>
diff --git a/derbyLocale_it-10.6.1.0.pom b/derbyLocale_it-10.6.2.1.pom
similarity index 97%
rename from derbyLocale_it-10.6.1.0.pom
rename to derbyLocale_it-10.6.2.1.pom
index 92f085c..f93aa6a 100644
--- a/derbyLocale_it-10.6.1.0.pom
+++ b/derbyLocale_it-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derbyLocale_it</artifactId>
<name>Apache Derby messages: Italian</name>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
<optional>false</optional>
</dependency>
</dependencies>
diff --git a/derbyLocale_ja_JP-10.6.1.0.pom b/derbyLocale_ja_JP-10.6.2.1.pom
similarity index 97%
rename from derbyLocale_ja_JP-10.6.1.0.pom
rename to derbyLocale_ja_JP-10.6.2.1.pom
index 316f75e..7330312 100644
--- a/derbyLocale_ja_JP-10.6.1.0.pom
+++ b/derbyLocale_ja_JP-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derbyLocale_ja_JP</artifactId>
<name>Apache Derby messages: Japanese</name>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
<optional>false</optional>
</dependency>
</dependencies>
diff --git a/derbyLocale_ko_KR-10.6.1.0.pom b/derbyLocale_ko_KR-10.6.2.1.pom
similarity index 97%
rename from derbyLocale_ko_KR-10.6.1.0.pom
rename to derbyLocale_ko_KR-10.6.2.1.pom
index 0a5bdf6..74d8c45 100644
--- a/derbyLocale_ko_KR-10.6.1.0.pom
+++ b/derbyLocale_ko_KR-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derbyLocale_ko_KR</artifactId>
<name>Apache Derby messages: Korean</name>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
<optional>false</optional>
</dependency>
</dependencies>
diff --git a/derbyLocale_pl-10.6.1.0.pom b/derbyLocale_pl-10.6.2.1.pom
similarity index 97%
rename from derbyLocale_pl-10.6.1.0.pom
rename to derbyLocale_pl-10.6.2.1.pom
index 37adca2..5e48f06 100644
--- a/derbyLocale_pl-10.6.1.0.pom
+++ b/derbyLocale_pl-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derbyLocale_pl</artifactId>
<name>Apache Derby messages: Polish</name>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
<optional>false</optional>
</dependency>
</dependencies>
diff --git a/derbyLocale_pt_BR-10.6.1.0.pom b/derbyLocale_pt_BR-10.6.2.1.pom
similarity index 97%
rename from derbyLocale_pt_BR-10.6.1.0.pom
rename to derbyLocale_pt_BR-10.6.2.1.pom
index 6b1bdfe..73cd52f 100644
--- a/derbyLocale_pt_BR-10.6.1.0.pom
+++ b/derbyLocale_pt_BR-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derbyLocale_pt_BR</artifactId>
<name>Apache Derby messages: Portuguese (Brazilian)</name>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
<optional>false</optional>
</dependency>
</dependencies>
diff --git a/derbyLocale_ru-10.6.1.0.pom b/derbyLocale_ru-10.6.2.1.pom
similarity index 97%
rename from derbyLocale_ru-10.6.1.0.pom
rename to derbyLocale_ru-10.6.2.1.pom
index 9844fa2..f083c5a 100644
--- a/derbyLocale_ru-10.6.1.0.pom
+++ b/derbyLocale_ru-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derbyLocale_ru</artifactId>
<name>Apache Derby messages: Russian</name>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
<optional>false</optional>
</dependency>
</dependencies>
diff --git a/derbyLocale_zh_CN-10.6.1.0.pom b/derbyLocale_zh_CN-10.6.2.1.pom
similarity index 97%
rename from derbyLocale_zh_CN-10.6.1.0.pom
rename to derbyLocale_zh_CN-10.6.2.1.pom
index 58d958d..fd95053 100644
--- a/derbyLocale_zh_CN-10.6.1.0.pom
+++ b/derbyLocale_zh_CN-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derbyLocale_zh_CN</artifactId>
<name>Apache Derby messages: Chinese (Simplified)</name>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
<optional>false</optional>
</dependency>
</dependencies>
diff --git a/derbyLocale_zh_TW-10.6.1.0.pom b/derbyLocale_zh_TW-10.6.2.1.pom
similarity index 97%
rename from derbyLocale_zh_TW-10.6.1.0.pom
rename to derbyLocale_zh_TW-10.6.2.1.pom
index 0b966da..3ffdbf4 100644
--- a/derbyLocale_zh_TW-10.6.1.0.pom
+++ b/derbyLocale_zh_TW-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derbyLocale_zh_TW</artifactId>
<name>Apache Derby messages: Chinese (Traditional)</name>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
<optional>false</optional>
</dependency>
</dependencies>
diff --git a/derbyclient-10.6.1.0.pom b/derbyclient-10.6.2.1.pom
similarity index 98%
rename from derbyclient-10.6.1.0.pom
rename to derbyclient-10.6.2.1.pom
index 0e56817..87a6840 100644
--- a/derbyclient-10.6.1.0.pom
+++ b/derbyclient-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derbyclient</artifactId>
<name>Apache Derby Client JDBC Driver</name>
diff --git a/derbynet-10.6.1.0.pom b/derbynet-10.6.2.1.pom
similarity index 97%
rename from derbynet-10.6.1.0.pom
rename to derbynet-10.6.2.1.pom
index 5fb838e..57755d0 100644
--- a/derbynet-10.6.1.0.pom
+++ b/derbynet-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derbynet</artifactId>
<name>Apache Derby Network Server</name>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
<optional>false</optional>
</dependency>
</dependencies>
diff --git a/derbytools-10.6.1.0.pom b/derbytools-10.6.2.1.pom
similarity index 98%
rename from derbytools-10.6.1.0.pom
rename to derbytools-10.6.2.1.pom
index 5bec4a1..b03043d 100644
--- a/derbytools-10.6.1.0.pom
+++ b/derbytools-10.6.2.1.pom
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.derby</groupId>
<artifactId>derby-project</artifactId>
- <version>10.6.1.0</version>
+ <version>10.6.2.1</version>
</parent>
<artifactId>derbytools</artifactId>
<name>Apache Derby Tools</name>
diff --git a/sources b/sources
index aa2976e..8fa9a8c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
8efaafa8f7704c8990908cd323034d29 db-derby-10.6.1.0-src.tar.gz
+fdb187f65d48596c4509d68da55aa4f8 db-derby-10.6.2.1-src.tar.gz
More information about the scm-commits
mailing list