commit 99a6708ef55337c79dfd6466b30853055fe25bf9
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Fri Mar 21 13:36:21 2014 +0100
Update to upstream version 52.1
icu4j-50.1.1.pom => icu4j-52.1.pom | 32 +++++++++++++++++++++-----------
icu4j.spec | 13 +++++++++----
sources | 2 +-
3 files changed, 31 insertions(+), 16 deletions(-)
---
diff --git a/icu4j-50.1.1.pom b/icu4j-52.1.pom
similarity index 88%
rename from icu4j-50.1.1.pom
rename to icu4j-52.1.pom
index 4fdb77a..f7c681e 100644
--- a/icu4j-50.1.1.pom
+++ b/icu4j-52.1.pom
@@ -1,19 +1,22 @@
+<?xml version="1.0"?>
<!--
*******************************************************************************
-* Copyright (C) 2010-2011, International Business Machines Corporation and *
+* Copyright (C) 2010-2013, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
---><project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
+-->
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
- <version>50.1.1</version>
-
+ <version>52.1</version>
+
<name>ICU4J</name>
<description>
International Component for Unicode for Java (ICU4J) is a mature, widely used Java
library
- providing Unicode and Globalization support
+ providing Unicode and Globalization support
</description>
<
url>http://icu-project.org/</url>
<inceptionYear>2001</inceptionYear>
@@ -24,7 +27,7 @@
<distribution>repo</distribution>
</license>
</licenses>
-
+
<developers>
<developer>
<id>mark</id>
@@ -75,6 +78,14 @@
</roles>
</developer>
<developer>
+ <id>pedberg</id>
+ <name>Peter Edberg</name>
+ <organization>Apple</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ <developer>
<id>yoshito</id>
<name>Yoshito Umaoka</name>
<organization>IBM Corporation</organization>
@@ -83,7 +94,7 @@
</roles>
</developer>
</developers>
-
+
<mailingLists>
<mailingList>
<name>icu-support</name>
@@ -107,7 +118,7 @@
<
archive>http://sourceforge.net/mailarchive/forum.php?forum_name=icu-de...
</mailingList>
</mailingLists>
-
+
<scm>
<
connection>scm:svn:http://source.icu-project.org/repos/icu/icu4j/trunk...
<
developerConnection>scm:svn:http://source.icu-project.org/repos/icu/ic...
@@ -117,7 +128,7 @@
<system>Trac</system>
<
url>http://bugs.icu-project.org/trac/</url>
</issueManagement>
-
+
<distributionManagement>
<repository>
<id>icu4j-releases</id>
@@ -131,4 +142,3 @@
</snapshotRepository>
</distributionManagement>
</project>
-
diff --git a/icu4j.spec b/icu4j.spec
index 7b1bbf8..ef4b9ee 100644
--- a/icu4j.spec
+++ b/icu4j.spec
@@ -50,8 +50,8 @@
%endif
Name: %{?scl_prefix}icu4j
-Version: 50.1.1
-Release: 2%{?dist}
+Version: 52.1
+Release: 1%{?dist}
Epoch: 1
Summary: International Components for Unicode for Java
License: MIT and EPL
@@ -59,7 +59,7 @@ URL:
http://site.icu-project.org/
Group: Development/Libraries
#CAUTION
#to create a tarball use following procedure
-#svn co
http://source.icu-project.org/repos/icu/icu4j/tags/release-50-1-1-eclipse...
icu4j-<version>
+#svn co
http://source.icu-project.org/repos/icu/icu4j/tags/release-52-eclipse-201...
icu4j-<version>
#tar caf icu4j-<version>.tar.xz icu4j-<version>/
Source0: icu4j-%{version}.tar.xz
Source1: %{pkg_name}-%{version}.pom
@@ -76,7 +76,7 @@ BuildRequires: zip
Requires: jpackage-utils
%{?scl:Requires: %scl_runtime}
# This is to ensure we get OpenJDK and not GCJ
-Requires: java >= 1:1.6.0
+Requires: java-headless >= 1:1.6.0
%if %{with_eclipse}
BuildRequires: %{?scl_prefix}eclipse-pde >= 0:3.2.1
%global debug_package %{nil}
@@ -148,6 +148,7 @@ sed --in-place "s:/usr/lib:%{_datadir}:g" build.xml
ECLIPSE_BASE=%{eclipse_base}
pushd eclipse-build
%ant -Dj2se.apidoc=%{_javadocdir}/java -Declipse.home=${ECLIPSE_BASE} \
+ -Djava.rt=%{_jvmdir}/jre/lib/rt.jar \
-Declipse.basews=gtk -Declipse.baseos=linux \
-Declipse.pde.dir=${ECLIPSE_BASE}/dropins/sdk/plugins/`ls
${ECLIPSE_BASE}/dropins/sdk/plugins/|grep org.eclipse.pde.build_`
popd
@@ -199,6 +200,10 @@ cp %{pkg_name}-%{version}.pom
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{pkg_name}.pom
%endif
%changelog
+* Tue Mar 18 2014 Michael Simacek <msimacek(a)redhat.com> - 1:52.1-1
+- Update to upstream version 52.1
+- Require java-headless
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:50.1.1-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 4b78f72..e9b179d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb2503b3fa9ada9bff88208835d68280 icu4j-50.1.1.tar.xz
+e52729889dafc60a25b2a8d3a82725be icu4j-52.1.tar.xz