diff --git a/.devtoolset-3-icu4j.metadata b/.devtoolset-3-icu4j.metadata index ac3bec1..d9f6f0b 100644 --- a/.devtoolset-3-icu4j.metadata +++ b/.devtoolset-3-icu4j.metadata @@ -1 +1 @@ -b5af9d4b213a89cc45c14a36bd543d57c6b4fb7f SOURCES/icu4j-52.1.tar.xz +d6c32a3e7d2fffc000ae789be4a0347fbecdc000 SOURCES/icu4j-54.1.1.tar.xz diff --git a/.gitignore b/.gitignore index 3f7d721..01da701 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/icu4j-52.1.tar.xz +SOURCES/icu4j-54.1.1.tar.xz diff --git a/SOURCES/icu4j-52.1.pom b/SOURCES/icu4j-52.1.pom deleted file mode 100644 index f7c681e..0000000 --- a/SOURCES/icu4j-52.1.pom +++ /dev/null @@ -1,144 +0,0 @@ - - - - 4.0.0 - - com.ibm.icu - icu4j - 52.1 - - ICU4J - - International Component for Unicode for Java (ICU4J) is a mature, widely used Java library - providing Unicode and Globalization support - - http://icu-project.org/ - 2001 - - - ICU License - http://source.icu-project.org/repos/icu/icu/trunk/license.html - repo - - - - - - mark - Mark Davis - Google - - PMC Member - - - - emmons - John Emmons - IBM Corporation - - PMC Member - - - - doug - Doug Felt - Google - - PMC Member - - - - deborah - Deborah Goldsmith - Apple - - PMC Member - - - - srl - Steven Loomis - IBM Corporation - - PMC Member - - - - markus - Markus Scherer - Google - - PMC Member - - - - pedberg - Peter Edberg - Apple - - PMC Member - - - - yoshito - Yoshito Umaoka - IBM Corporation - - PMC Member - - - - - - - icu-support - https://lists.sourceforge.net/lists/listinfo/icu-support - https://lists.sourceforge.net/lists/listinfo/icu-support - icu-support@lists.sourceforge.net - http://sourceforge.net/mailarchive/forum.php?forum_name=icu-support - - - icu-announce - https://lists.sourceforge.net/lists/listinfo/icu-announce - https://lists.sourceforge.net/lists/listinfo/icu-announce - icu-announce@lists.sourceforge.net - http://sourceforge.net/mailarchive/forum.php?forum_name=icu-announce - - - icu-design - https://lists.sourceforge.net/lists/listinfo/icu-design - https://lists.sourceforge.net/lists/listinfo/icu-design - icu-design@lists.sourceforge.net - http://sourceforge.net/mailarchive/forum.php?forum_name=icu-design - - - - - scm:svn:http://source.icu-project.org/repos/icu/icu4j/trunk/ - scm:svn:http://source.icu-project.org/repos/icu/icu4j/trunk/ - http://source.icu-project.org/repos/icu/icu4j/trunk/ - - - Trac - http://bugs.icu-project.org/trac/ - - - - - icu4j-releases - ICU4J Central Repository - http://oss.sonatype.org/service/local/staging/deploy/maven2 - - - icu4j-snapshots - ICU4J Central Development Repository - http://oss.sonatype.org/content/repositories/snapshots - - - diff --git a/SOURCES/improve-osgi-manifest.patch b/SOURCES/improve-osgi-manifest.patch new file mode 100644 index 0000000..384079e --- /dev/null +++ b/SOURCES/improve-osgi-manifest.patch @@ -0,0 +1,54 @@ +--- manifest.stub.orig 2014-11-17 14:56:10.568212293 +0000 ++++ manifest.stub 2014-11-17 15:00:31.395686692 +0000 +@@ -9,10 +9,28 @@ + Bundle-ManifestVersion: 2 + Bundle-Name: ICU4J + Bundle-Description: International Components for Unicode for Java +-Bundle-SymbolicName: com.ibm.icu ++Bundle-SymbolicName: com.ibm.icu; singleton:=true + Bundle-Version: @IMPLVERSION@ + Bundle-Vendor: IBM Corporation + Bundle-Copyright: @COPYRIGHT@ + Bundle-RequiredExecutionEnvironment: @EXECENV@ + Main-Class: com.ibm.icu.util.VersionInfo +-Export-Package: com.ibm.icu.lang,com.ibm.icu.math,com.ibm.icu.text,com.ibm.icu.util +\ No newline at end of file ++Export-Package: com.ibm.icu.lang;base=true;full=true;version="@IMPLVERSION@", ++ com.ibm.icu.math;base=true;full=true;version="@IMPLVERSION@", ++ com.ibm.icu.text;base=true;full=true;version="@IMPLVERSION@", ++ com.ibm.icu.util;base=true;full=true;version="@IMPLVERSION@", ++ com.ibm.icu.impl;x-internal:=true, ++ com.ibm.icu.impl.data;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b.brkitr;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b.coll;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b.curr;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b.lang;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b.rbnf;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b.region;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b.translit;x-internal:=true, ++ com.ibm.icu.impl.data.icudt@DATAVERSION@b.zone;x-internal:=true, ++ com.ibm.icu.impl.duration;x-internal:=true, ++ com.ibm.icu.impl.locale;x-internal:=true ++Eclipse-LazyStart: true ++Eclipse-ExtensibleAPI: true +--- main/shared/build/common-targets.xml.orig 2014-11-17 14:59:05.335849961 +0000 ++++ main/shared/build/common-targets.xml 2014-11-17 14:59:36.868423736 +0000 +@@ -78,6 +78,7 @@ + + + ++ + + + +--- build.xml.orig 2014-11-17 21:45:53.308610711 +0000 ++++ build.xml 2014-11-17 21:46:29.969096734 +0000 +@@ -371,6 +371,7 @@ + + + ++ + + + diff --git a/SPECS/icu4j.spec b/SPECS/icu4j.spec index c644f01..61ff53f 100644 --- a/SPECS/icu4j.spec +++ b/SPECS/icu4j.spec @@ -1,82 +1,40 @@ -# 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. -# - %{?scl:%scl_package icu4j} %{!?scl:%global pkg_name %{name}} - -%global with_eclipse 1 - -%global eclipse_base `more %{_bindir}/eclipse-pdebuild | grep datadir= | sed -e "s/datadir=//"`/eclipse -# Note: this next section looks weird having an arch specified in a -# noarch specfile but the parts of the build -# All arches line up between Eclipse and Linux kernel names except i386 -> x86 -%ifarch %{ix86} -%global eclipse_arch x86 -%else -%global eclipse_arch %{_arch} -%endif +%{?java_common_find_provides_and_requires} Name: %{?scl_prefix}icu4j -Version: 52.1 -Release: 2.2%{?dist} +Version: 54.1.1 +Release: 4.4%{?dist} Epoch: 1 Summary: International Components for Unicode for Java -License: MIT and EPL +License: MIT and EPL 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-52-eclipse-20140218 icu4j- +#svn co http://source.icu-project.org/repos/icu/icu4j/tags/release-54-1-1 icu4j- #tar caf icu4j-.tar.xz icu4j-/ Source0: icu4j-%{version}.tar.xz -Source1: %{pkg_name}-%{version}.pom - -BuildRequires: ant >= 1.7.0 -# FIXME: is this necessary or is it just adding strings in the hrefs in -# the docs? -BuildRequires: java-javadoc >= 1:1.6.0 -# This is to ensure we get OpenJDK and not GCJ -BuildRequires: java-devel >= 1:1.7.0 -BuildRequires: jpackage-utils >= 0:1.5 + +# Java 8 taglet API changes +#Patch0: java8-taglets.patch + +# Add better OSGi metadata to core jar +Patch1: improve-osgi-manifest.patch + +BuildRequires: %{?scl_prefix_java_common}ant +BuildRequires: java-devel +BuildRequires: java-javadoc +BuildRequires: %{?scl_prefix_java_common}javapackages-local 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 -%if %{with_eclipse} -BuildRequires: %{?scl_prefix}eclipse-pde >= 0:3.2.1 -%global debug_package %{nil} -%endif + +# Obsoletes/provides added in F22 +Obsoletes: %{name}-eclipse < %{epoch}:%{version}-%{release} +Provides: %{name}-eclipse = %{epoch}:%{version}-%{release} BuildArch: noarch +%{?scl:Requires: %scl_runtime} %description The International Components for Unicode (ICU) library provides robust and @@ -94,109 +52,100 @@ richer APIs, while remaining as compatible as possible with the original Java text and internationalization API design. %package charset -Summary: Charset sublibrary of %{pkg_name} -Group: Development/Libraries -Requires: jpackage-utils +Summary: Charset converter library of %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} %description charset -Charset sublibrary of %{pkg_name}. +Charset converter library of %{pkg_name}. + +%package localespi +Summary: Locale SPI library of %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description localespi +Locale SPI library of %{pkg_name}. %package javadoc Summary: Javadoc for %{pkg_name} -Group: Documentation -Requires: jpackage-utils -Requires: java-javadoc >= 1:1.6.0 +Requires: java-javadoc %description javadoc -Javadoc for %{pkg_name}. +API documentation for %{pkg_name}. -%if %{with_eclipse} -%package eclipse -Summary: Eclipse plugin for %{pkg_name} -Group: Development/Libraries -Requires: jpackage-utils +%prep +%setup -q -n icu4j-%{version} -%description eclipse -Eclipse plugin support for %{pkg_name}. +#%patch0 +%patch1 -%endif +%build +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +export JAVA_HOME=/usr/lib/jvm/java/ +ant -Dicu4j.api.doc.jdk.link=/usr/share/javadoc/java all check -%prep -%setup -q -n %{pkg_name}-%{version} +%mvn_artifact pom.xml icu4j.jar +%{?scl:EOF} -cp %{SOURCE1} . +%install +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +%mvn_install -J doc +%{?scl:EOF} -%{__sed} -i 's/\r//' APIChangeReport.html -%{__sed} -i 's/\r//' readme.html +# No poms for these, so install manually +install -m 644 icu4j-charset.jar %{buildroot}%{_javadir}/icu4j/ +install -m 644 icu4j-localespi.jar %{buildroot}%{_javadir}/icu4j/ -sed --in-place "s/ .*bootclasspath=.*//g" build.xml -sed --in-place "s///" build.xml -sed --in-place "/javac1.3/d" build.xml -sed --in-place "s:/usr/lib:%{_datadir}:g" build.xml +%files -f .mfiles +%doc main/shared/licenses/license.html readme.html APIChangeReport.html +%dir %{_javadir}/icu4j +%dir %{_mavenpomdir}/icu4j -%build -%ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 -Dj2se.apidoc=%{_javadocdir}/java jar docs -%if %{with_eclipse} -ECLIPSE_BASE=%{eclipse_base} -pushd eclipse-build - %ant -Dj2se.apidoc=%{_javadocdir}/java -Declipse.home=${ECLIPSE_BASE} \ - -Djava.rt=%{_root_prefix}/lib/jvm/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 -%endif - -%install +%files charset +%doc main/shared/licenses/license.html +%{_javadir}/icu4j/icu4j-charset.jar -# jars -%__mkdir_p %{buildroot}%{_javadir} -%__cp -ap %{pkg_name}.jar %{buildroot}%{_javadir}/%{pkg_name}.jar -%__cp -ap %{pkg_name}-charset.jar %{buildroot}%{_javadir}/%{pkg_name}-charset.jar +%files localespi +%doc main/shared/licenses/license.html +%{_javadir}/icu4j/icu4j-localespi.jar -# javadoc -%__mkdir_p %{buildroot}%{_javadocdir}/%{pkg_name} -%__cp -pr doc/* %{buildroot}%{_javadocdir}/%{pkg_name} +%files javadoc -f .mfiles-javadoc +%doc main/shared/licenses/license.html -%if %{with_eclipse} -# eclipse -install -d -m755 %{buildroot}%{_javadir}/icu4j-eclipse +%changelog +* Fri Mar 27 2015 Mat Booth - 1:54.1.1-4.4 +- Fixes: rhbz#1206550 - Rebuild to fix requires on SCL runtimes -unzip -qq -d %{buildroot}%{_javadir}/icu4j-eclipse eclipse-build/out/projects/ICU4J.com.ibm.icu/com.ibm.icu-com.ibm.icu.zip -%endif +* Mon Jan 12 2015 Mat Booth - 1:54.1.1-4.3 +- Related: rhbz#1175105 - rebuilt -# maven stuff -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -cp %{pkg_name}-%{version}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{pkg_name}.pom -%add_maven_depmap JPP-%{pkg_name}.pom %{pkg_name}.jar +* Thu Jan 08 2015 Mat Booth - 1:54.1.1-4.2 +- Related: rhbz#1175105 - Rebuild for correct disttag. -%files -%doc readme.html APIChangeReport.html -%{_javadir}/%{pkg_name}.jar -%{_mavendepmapfragdir}/* -%{_mavenpomdir}/*.pom +* Tue Jan 06 2015 Mat Booth - 1:54.1.1-4.1 +- Resolves: rhbz#1175105 - Import into DTS 3.1 +- Don't use java8 patch, only needed for generating javadoc when java < 8 + is not available -%files charset -%{_javadir}/%{pkg_name}-charset.jar +* Fri Nov 21 2014 Mat Booth - 1:54.1.1-4 +- Drop unnecessay requires on main package and fix requires on sub packages -%files javadoc -%doc %{_javadocdir}/* +* Fri Nov 21 2014 Mat Booth - 1:54.1.1-3 +- Drop the eclipse sub-package, no longer needed -%if %{with_eclipse} -%files eclipse -%dir %{_javadir}/icu4j-eclipse/ -%dir %{_javadir}/icu4j-eclipse/features -%dir %{_javadir}/icu4j-eclipse/plugins -%{_javadir}/icu4j-eclipse/features/* -%{_javadir}/icu4j-eclipse/plugins/* -%doc readme.html -%endif +* Mon Nov 17 2014 Mat Booth - 1:54.1.1-2 +- Fix typo in osgi manifest patch -%changelog -* Tue Jun 3 2014 Alexander Kurtakov 1:52.1-2.2 -- Drop unused patches. +* Mon Nov 17 2014 Mat Booth - 1:54.1.1-1 +- Update to latest upstream release +- Add patch for building against java 8 taglet API + - Fixes: rhbz#1087450, rhbz#1106794 +- Add patch for generating better OSGi metadata in core lib +- Install core lib with mvn_install +- Package localespi lib +- Run test suite -* Tue May 20 2014 Alexander Kurtakov 1:52.1-2.1 -- Enable eclipse. +* Sat Jun 07 2014 Fedora Release Engineering - 1:52.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild * Fri Mar 28 2014 Michael Simacek - 1:52.1-2 - Use Requires: java-headless rebuild (#1067528) @@ -382,5 +331,5 @@ cp %{pkg_name}-%{version}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{pkg_name}.pom * Mon Feb 27 2006 Fernando Nasser - 0:3.2-2jpp - First JPP 1.7 build -* Sun Jan 29 2005 David Walluck 0:3.2-1jpp +* Sat Jan 29 2005 David Walluck 0:3.2-1jpp - release (contributed by Mary Ellen Foster )