commit a8f8cdd56179d1603dcb7df3fc511e95bd6142ce
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Mon May 9 15:48:35 2011 +0300
Use proper tarball.
Fix build.
.gitignore | 5 +-
icu4j-4.0.1.pom | 22 --------
icu4j-4.4.2.pom | 134 +++++++++++++++++++++++++++++++++++++++++++++++++
icu4j-crosslink.patch | 31 ++++-------
icu4j.spec | 53 ++++++++++----------
sources | 2 +-
6 files changed, 174 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 545f33e..073f5d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-icu4j-3_8_1-src.jar
-icu4j-4_0_1-src.jar
-icu4j-4_2_1-src.jar
+icu4j-*-src.jar
+/icu4j-4.4.2.tar.xz
diff --git a/icu4j-4.4.2.pom b/icu4j-4.4.2.pom
new file mode 100644
index 0000000..ba2918c
--- /dev/null
+++ b/icu4j-4.4.2.pom
@@ -0,0 +1,134 @@
+<!--
+*******************************************************************************
+* Copyright (C) 2010-2011, 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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>4.4.2</version>
+
+ <name>ICU4J</name>
+ <description>
+ International Component for Unicode for Java (ICU4J) is a mature, widely used Java
library
+ providing Unicode and Globalization support
+ </description>
+ <
url>http://icu-project.org/</url>
+ <inceptionYear>2001</inceptionYear>
+ <licenses>
+ <license>
+ <name>ICU License</name>
+
<
url>http://source.icu-project.org/repos/icu/icu/trunk/license.html<...
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <developers>
+ <developer>
+ <id>mark</id>
+ <name>Mark Davis</name>
+ <organization>Google</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>emmons</id>
+ <name>John Emmons</name>
+ <organization>IBM Corporation</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>doug</id>
+ <name>Doug Felt</name>
+ <organization>Google</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>deborah</id>
+ <name>Deborah Goldsmith</name>
+ <organization>Apple</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>srl</id>
+ <name>Steven Loomis</name>
+ <organization>IBM Corporation</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>markus</id>
+ <name>Markus Scherer</name>
+ <organization>Google</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>yoshito</id>
+ <name>Yoshito Umaoka</name>
+ <organization>IBM Corporation</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <mailingLists>
+ <mailingList>
+ <name>icu-support</name>
+
<
subscribe>https://lists.sourceforge.net/lists/listinfo/icu-support<...
+
<
unsubscribe>https://lists.sourceforge.net/lists/listinfo/icu-support&l...
+ <post>icu-support(a)lists.sourceforge.net</post>
+
<
archive>http://sourceforge.net/mailarchive/forum.php?forum_name=icu-su...
+ </mailingList>
+ <mailingList>
+ <name>icu-announce</name>
+
<
subscribe>https://lists.sourceforge.net/lists/listinfo/icu-announce<...
+
<
unsubscribe>https://lists.sourceforge.net/lists/listinfo/icu-announce&...
+ <post>icu-announce(a)lists.sourceforge.net</post>
+
<
archive>http://sourceforge.net/mailarchive/forum.php?forum_name=icu-an...
+ </mailingList>
+ <mailingList>
+ <name>icu-design</name>
+
<
subscribe>https://lists.sourceforge.net/lists/listinfo/icu-design</...
+
<
unsubscribe>https://lists.sourceforge.net/lists/listinfo/icu-design<...
+ <post>icu-design(a)lists.sourceforge.net</post>
+
<
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...
+ <
url>http://source.icu-project.org/repos/icu/icu4j/trunk/</url>
+ </scm>
+ <issueManagement>
+ <system>Trac</system>
+ <
url>http://bugs.icu-project.org/trac/</url>
+ </issueManagement>
+
+ <distributionManagement>
+ <repository>
+ <id>icu4j-releases</id>
+ <name>ICU4J Central Repository</name>
+ <
url>http://oss.sonatype.org/service/local/staging/deploy/maven2</ur...
+ </repository>
+ <snapshotRepository>
+ <id>icu4j-snapshots</id>
+ <name>ICU4J Central Development Repository</name>
+ <
url>http://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+</project>
+
diff --git a/icu4j-crosslink.patch b/icu4j-crosslink.patch
index 957af68..ccb7536 100644
--- a/icu4j-crosslink.patch
+++ b/icu4j-crosslink.patch
@@ -1,20 +1,11 @@
---- build.xml.orig 2007-12-10 21:56:54.000000000 -0500
-+++ build.xml 2008-06-30 18:29:36.000000000 -0400
-@@ -425,7 +425,7 @@
- docencoding="iso-8859-1"
- bottom="<font size=-1>Copyright (c) ${current.year} IBM
Corporation and others.</font>"
- additionalparam="${doc.params}"
--
link="http://java.sun.com/j2se/1.5/docs/api"
-+ link="${j2se.apidoc}"
- source="1.4" />
- </target>
-
-@@ -442,7 +442,7 @@
- docencoding="iso-8859-1"
- bottom="<font size=-1>Copyright (c) ${current.year} IBM
Corporation and others.</font>"
- additionalparam="${doc.params}"
--
link="http://java.sun.com/j2se/1.5/docs/api"
-+ link="${j2se.apidoc}"
- source="1.4" />
- </target>
-
+--- build.xml.sav 2011-05-09 15:34:33.558950383 +0300
++++ build.xml 2011-05-09 15:37:10.204119756 +0300
+@@ -448,7 +448,7 @@
+ docencoding="iso-8859-1"
+ bottom="<font size=-1>Copyright (c) ${current.year}
IBM Corporation and others.</font>"
+ additionalparam="-breakiterator -use -tagletpath
${icu4j.build-tools.jar} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet"
+-
link="http://java.sun.com/javase/6/docs/api/"
++ link="${j2se.apidoc}"
+ source="1.5">
+ <packageset dir="${icu4j.core.dir}/src">
+ <include name="com/ibm/icu/lang/**"/>
diff --git a/icu4j.spec b/icu4j.spec
index 428756e..a5fe570 100644
--- a/icu4j.spec
+++ b/icu4j.spec
@@ -43,18 +43,19 @@
%endif
Name: icu4j
-Version: 4.2.1
+Version: 4.4.2
Release: 2%{?dist}
Epoch: 1
Summary: International Components for Unicode for Java
License: MIT and EPL
-URL:
http://www-306.ibm.com/software/globalization/icu/index.jsp
+URL:
http://site.icu-project.org/
Group: Development/Libraries
-Source0:
http://download.icu-project.org/files/icu4j/4.2.1/icu4j-4_2_1-src.jar
-Source1:
http://repo2.maven.org/maven2/com/ibm/icu/icu4j/4.0.1/%{name}-4.0.1.pom
+#http://source.icu-project.org/repos/icu/icu4j/tags/release-4-4-2-eclipse37-20110208/
icu4j-4.4.2
+#tar caf icu4j-4.4.2.tar.xz icu4j-4.4.2/
+Source0: icu4j-4.4.2.tar.xz
+Source1: %{name}-4.4.2.pom
+
Patch0: %{name}-crosslink.patch
-# PDE Build is in a location the upstream build.xml doesn't check
-Patch4: %{name}-pdebuildlocation.patch
BuildRequires: ant >= 1.7.0
# FIXME: is this necessary or is it just adding strings in the hrefs in
# the docs?
@@ -73,7 +74,6 @@ BuildRequires: eclipse-pde >= 0:3.2.1
%else
BuildArch: noarch
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
The International Components for Unicode (ICU) library provides robust and
@@ -111,13 +111,11 @@ Eclipse plugin support for %{name}.
%endif
%prep
-%setup -q -c
-%patch0 -p0
-%patch4 -p0
+%setup -q
+#%patch0 -p0
cp %{SOURCE1} .
-%{__sed} -i 's/\r//' license.html
%{__sed} -i 's/\r//' APIChangeReport.html
%{__sed} -i 's/\r//' readme.html
@@ -127,23 +125,20 @@ sed --in-place "/javac1.3/d" build.xml
sed --in-place "s:/usr/lib:%{_libdir}:g" build.xml
%build
+%ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 -Dj2se.apidoc=%{_javadocdir}/java
jar docs
%if %{with_eclipse}
+pushd eclipse-build
%ant -Dj2se.apidoc=%{_javadocdir}/java -Declipse.home=%{eclipse_base} \
-Declipse.basews=gtk -Declipse.baseos=linux \
-Declipse.basearch=%{eclipse_arch} \
- -Dicu4j.eclipse.build.version.string=4.2.1.v20100412 \
- jar docs eclipsePDEBuild
-%else
- %ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5
-Dj2se.apidoc=%{_javadocdir}/java jar docs
+ -Declipse.pde.dir=%{eclipse_base}/dropins/sdk/plugins/`ls
%{eclipse_base}/dropins/sdk/plugins/|grep org.eclipse.pde.build_`
+popd
%endif
-
+
%install
-%__rm -rf %{buildroot}
-
# jars
%__mkdir_p %{buildroot}%{_javadir}
-%__cp -ap %{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do %__ln_s ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
+%__cp -ap %{name}.jar %{buildroot}%{_javadir}/%{name}.jar
# javadoc
%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
@@ -154,12 +149,12 @@ sed --in-place "s:/usr/lib:%{_libdir}:g" build.xml
# eclipse
install -d -m755 %{buildroot}/%{eclipse_base}
-unzip -qq -d %{buildroot}/%{eclipse_base}
eclipseProjects/ICU4J.com.ibm.icu/com.ibm.icu-com.ibm.icu.zip
+unzip -qq -d %{buildroot}/%{eclipse_base}
eclipse-build/out/projects/ICU4J.com.ibm.icu/com.ibm.icu-com.ibm.icu.zip
%endif
# maven stuff
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-cp %{name}-4.0.1.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+cp %{name}-4.4.2.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap com.ibm.icu %{name} %{version} JPP %{name}
%post
@@ -168,12 +163,9 @@ cp %{name}-4.0.1.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%postun
%update_maven_depmap
-%clean
-%__rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
-%doc license.html readme.html APIChangeReport.html
+%doc readme.html APIChangeReport.html
%{_javadir}/%{name}*.jar
%{_mavendepmapfragdir}/*
%{_mavenpomdir}/*.pom
@@ -190,10 +182,17 @@ cp %{name}-4.0.1.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%dir %{_libdir}/eclipse/plugins
%{_libdir}/eclipse/features/*
%{_libdir}/eclipse/plugins/*
-%doc license.html readme.html
+%doc readme.html
%endif
%changelog
+* Mon May 9 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1:4.4.2-2
+- Use proper tarball.
+- Fix build.
+
+* Tue Apr 05 2011 Chris Aniszczyk <zx(a)redhat.com> 1:4.4.2-1
+- Update to 4.4.2.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:4.2.1-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index dcf611c..7518c9e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01f58c554dffce3b2365eec4c94ea921 icu4j-4_2_1-src.jar
+44f4bdc0e436931a158bbd40cca3a6a2 icu4j-4.4.2.tar.xz