rpms/icu4j/devel icu4j-crosslink.patch, NONE, 1.1 icu4j-disable-javadocs.patch, NONE, 1.1 icu4j.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Fernando Nasser (fnasser)
fedora-extras-commits at redhat.com
Wed Mar 14 15:27:53 UTC 2007
Author: fnasser
Update of /cvs/extras/rpms/icu4j/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10209/devel
Modified Files:
.cvsignore sources
Added Files:
icu4j-crosslink.patch icu4j-disable-javadocs.patch icu4j.spec
Log Message:
auto-import icu4j-3.4.5-2jpp.1.fc7 on branch devel from icu4j-3.4.5-2jpp.1.fc7.src.rpm
icu4j-crosslink.patch:
--- NEW FILE icu4j-crosslink.patch ---
--- build.xml.orig 2006-07-17 19:12:17.000000000 -0400
+++ build.xml 2006-07-17 19:13:59.000000000 -0400
@@ -339,7 +339,7 @@
docencoding="iso-8859-1"
bottom="<font size=-1>Copyright (c) 2006 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>
@@ -357,7 +357,7 @@
docencoding="iso-8859-1"
bottom="<font size=-1>Copyright (c) 2004 IBM Corporation and others.</font>"
additionalparam="${doc.params}"
- link="http://java.sun.com/j2se/1.4/docs/api"
+ link="${j2se.apidoc}"
source="1.4"/>
</target>
icu4j-disable-javadocs.patch:
--- NEW FILE icu4j-disable-javadocs.patch ---
--- build.xml.orig 2006-07-17 19:19:29.000000000 -0400
+++ build.xml 2006-07-17 19:20:15.000000000 -0400
@@ -302,7 +302,7 @@
debug="on" deprecation="off"/>
</target>
- <target name="tools" depends="core,one4tools" description="build tools">
+ <target name="tools" depends="core" description="build tools">
<javac includes="com/ibm/icu/dev/tool/**/*.java"
excludes="com/ibm/icu/dev/tool/cldr/*,com/ibm/icu/dev/tool/localeconverter/*,com/ibm/icu/dev/tool/docs/*,**/CVS/**/*"
srcdir="${src.dir}"
--- NEW FILE icu4j.spec ---
# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the
# distribution.
# 3. Neither the name of the JPackage Project nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# If you want to build with eclipse support
# give rpmbuild option '--with eclipse'
%define _with_eclipse 1
%define with_eclipse %{?_with_eclipse:1}%{!?_with_eclipse:0}
%define without_eclipse %{!?_with_eclipse:1}%{?_with_eclipse:0}
%define _with_gcj_support 1
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
%define section free
%define eclipse_name eclipse
%define eclipse_base %{_datadir}/%{eclipse_name}
%define eclipse_lib_base %{_libdir}/%{eclipse_name}
Name: icu4j
Version: 3.4.5
Release: 2jpp.1%{?dist}
Epoch: 0
Summary: International Components for Unicode for Java
License: MIT style
URL: http://www-306.ibm.com/software/globalization/icu/index.jsp
Group: Development/Libraries/Java
Source0: ftp://ftp.software.ibm.com/software/globalization/icu/icu4j/3.4.5/icu4jsrc_3_4_5.jar
Patch0: %{name}-crosslink.patch
Patch1: %{name}-disable-javadocs.patch
BuildRequires: ant
BuildRequires: java-javadoc
BuildRequires: jpackage-utils >= 0:1.5
Requires: jpackage-utils
%if %{with_eclipse}
BuildRequires: eclipse-pde >= 0:3.2.1
%endif
%if ! %{gcj_support}
BuildArch: noarch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
Requires(post): java-gcj-compat
Requires(postun): java-gcj-compat
%endif
%description
The International Components for Unicode (ICU) library provides robust and
full-featured Unicode services on a wide variety of platforms. ICU supports
the most current version of the Unicode standard, and provides support for
supplementary characters (needed for GB 18030 repertoire support).
Java provides a very strong foundation for global programs, and IBM and the
ICU team played a key role in providing globalization technology into Sun's
Java. But because of its long release schedule, Java cannot always keep
up-to-date with evolving standards. The ICU team continues to extend Java's
Unicode and internationalization support, focusing on improving
performance, keeping current with the Unicode standard, and providing
richer APIs, while remaining as compatible as possible with the original
Java text and internationalization API design.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
%if %{with_eclipse}
%package eclipse
Summary: Eclipse plugin for %{name}
Group: Text Editors/Integrated Development Environments (IDE)
Requires: jpackage-utils
Requires: eclipse-rcp
%description eclipse
Eclipse plugin support for %{name}.
%endif
%prep
%setup -q -c
%patch0 -p0
%patch1 -p0
%{__sed} -i 's/\r//' license.html
%{__sed} -i 's/\r//' APIChangeReport.html
%{__sed} -i 's/\r//' readme.html
%if %{with_eclipse}
# Without this, we get the dreaded "java.lang.Object not found" error
sed --in-place "s/ .*bootclasspath=.*//g" build.xml
%endif
%build
%if %{without_eclipse}
%ant -Dj2se.apidoc=%{_javadocdir}/java jar docs
%else
%ant -Dj2se.apidoc=%{_javadocdir}/java jar docs eclipseProjects
%endif
%if %{with_eclipse}
# eclipse build
export JAVA_HOME=%{java_home}
export PATH=%{java_bin}:/usr/bin:$PATH
# See comments in the script to understand this.
/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
SDK=$(cd SDK >/dev/null && pwd)
# Eclipse may try to write to the home directory.
%__mkdir_p home
homedir=$(cd home > /dev/null && pwd)
pushd eclipseProjects
# com.ibm.icu plugins
java -cp $SDK/startup.jar \
-Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
-Duser.home=$homedir \
org.eclipse.core.launcher.Main \
-application org.eclipse.ant.core.antRunner \
-Dtype=feature \
-Did=com.ibm.icu \
-DsourceDirectory=$(pwd) \
-DbaseLocation=$SDK \
-Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
-f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
# com.ibm.icu.source build fails to include actual src zip. Let's do it manually.
relzipfiledir=%{eclipse_name}/plugins/com.ibm.icu.source_%{version}/src/com.ibm.icu_%{version}
zipfiledir=$PWD/$relzipfiledir
%__mkdir_p $relzipfiledir
zipfile=$zipfiledir/src.zip
pushd com.ibm.icu
%__cp -rp about_files $zipfiledir
%__cp -p about.html $zipfiledir
pushd src
find -name \*.java | xargs touch --date=1/1/1980
zip -X -9 -r $zipfile . -i \*.java
popd
popd
zip -X -9 -r -u build/rpmBuild/com.ibm.icu.zip $relzipfiledir
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)
# javadoc
%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
%__cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
%__ln_s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
%if %{with_eclipse}
# eclipse
install -d -m755 %{buildroot}/%{eclipse_lib_base}
pushd eclipseProjects
# FIXME: icu4j generates res_index.txt differently on different arches - possible libgcj bug.
unzip -qq -d %{buildroot}/%{_datadir}/ build/rpmBuild/com.ibm.icu.zip
popd
%endif
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif
%clean
%__rm -rf %{buildroot}
%if %{gcj_support}
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%if %{gcj_support}
%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%files
%defattr(0644,root,root,0755)
%doc license.html readme.html APIChangeReport.html
%{_javadir}/%{name}*.jar
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/icu4j-3.4.5.jar.*
%endif
%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/*
%if %{with_eclipse}
%files eclipse
%defattr(0644,root,root,0755)
%{_datadir}/eclipse/features/*
%{_datadir}/eclipse/plugins/*
%doc license.html readme.html
%if %{gcj_support}
%{_libdir}/gcj/%{name}/com.ibm.icu*
%endif
%endif
%changelog
* Mon Feb 12 2007 Matt Wringe <mwringe at redhat.com> - 0:3.4.5-2jpp.1
- Fix some rpmlint issues
- Make use of buildroot more consistent
- Remove javadoc post and postun sections as per new jpp standard
- Change license section to 'MIT style' license from 'MIT' license.
This was done since the source package calls the license the
"X license" (see readme.html in src jar).
- Install eclipse plugin into /usr/share/eclipse
* Mon Jan 22 2007 Fernando Nasser <fnasser at redhat.com> - 0:3.4.5-2jpp.1
- Merge with upstream
* Mon Jan 22 2007 Fernando Nasser <fnasser at redhat.com> - 0:3.4.5-2jpp
- Add optional eclipse subpackage, created by
Jeff Johnston <jjohnstn at rdhat.com> :
- Add eclipse sub-package to create plugins.
* Mon Jan 22 2007 Fernando Nasser <fnasser at redhat.com> - 0:3.4.5-1jpp
- Upgrade to 3.4.5 with merge
- Re-enable javadoc
* Mon Sep 04 2006 Ben Konrath <bkonrath at redhat.com> 0:3.4.5-1jpp_1fc
- 3.4.5.
- Add GCJ support with spec-convert-gcj-1.6.
* Mon Jul 17 2006 Ben Konrath <bkonrath at redhat.com> 0:3.4.4-1jpp_1fc
- 3.4.4.
- Add disable javadocs patch.
* Tue Feb 28 2006 Fernando Nasser <fnasser at redhat.com> - 0:3.2-2jpp_1rh
- First Red Hat build
* Mon Feb 27 2006 Fernando Nasser <fnasser at redhat.com> - 0:3.2-2jpp
- First JPP 1.7 build
* Sun Jan 29 2005 David Walluck <david at jpackage.org> 0:3.2-1jpp
- release (contributed by Mary Ellen Foster <mefoster at gmail.com>)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/icu4j/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 13 Mar 2007 02:22:19 -0000 1.1
+++ .cvsignore 14 Mar 2007 15:27:21 -0000 1.2
@@ -0,0 +1 @@
+icu4jsrc_3_4_5.jar
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/icu4j/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 13 Mar 2007 02:22:19 -0000 1.1
+++ sources 14 Mar 2007 15:27:21 -0000 1.2
@@ -0,0 +1 @@
+c3be75d8af3c31b7a1748247ab3fee95 icu4jsrc_3_4_5.jar
More information about the fedora-extras-commits
mailing list