Attachment 145093 Details for Bug 199504 – Proposed patch to icu4j/devel/icu4j.spec revised.

[patch] Proposed patch to icu4j/devel/icu4j.spec revised.

icu4j.spec.diff2 (text/plain), 4.29 KB, created by Jeff Johnston on 2007-01-08 18:51:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Johnston

Created: 2007-01-08 18:51:59 UTC

Size: 4.29 KB

patch

obsolete

>Index: icu4j.spec
>===================================================================
>RCS file: /cvs/dist/rpms/icu4j/devel/icu4j.spec,v
>retrieving revision 1.6
>diff -u -p -r1.6 icu4j.spec
>--- icu4j.spec	5 Sep 2006 00:55:34 -0000	1.6
>+++ icu4j.spec	8 Jan 2007 18:47:07 -0000
>@@ -1,9 +1,12 @@
> %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:        1jpp_1fc
>+Release:        2jpp_1fc
> Epoch:          0
> Summary:        International Components for Unicode for Java
> License:        MIT
>@@ -15,6 +18,7 @@ Patch1:         %{name}-disable-javadocs
> BuildRequires:  ant
> BuildRequires:  java-javadoc
> BuildRequires:  jpackage-utils >= 0:1.5
>+BuildRequires:  eclipse-pde
> %if ! %{gcj_support}
> BuildArch:      noarch
> %endif
>@@ -47,13 +51,66 @@ Group:          Development/Documentatio
> %description javadoc
> Javadoc for %{name}.
> 
>+%package eclipse
>+Summary:        Eclipse plugin for %{name}
>+Group:          Text Editors/Integrated Development Environments (IDE) 
>+
>+%description eclipse
>+Eclipse plugin support for %{name}.
>+
> %prep
> %setup -q -c
> %patch0 -p0
> %patch1 -p0
> 
>+# Without this, we get the dreaded "java.lang.Object not found" error
>+sed --in-place "s/ .*bootclasspath=.*//g" build.xml
>+
> %build
>-%ant -Dj2se.apidoc=%{_javadocdir}/java jar docs
>+%ant -Dj2se.apidoc=%{_javadocdir}/java jar docs eclipseProjects
>+
>+# 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 -r about_files $zipfiledir
>+%__cp about.html $zipfiledir
>+pushd src
>+find -name \*.java | xargs touch --date=1/1/1970
>+zip -X -9 -r $zipfile . -i \*.java
>+popd
>+popd
>+zip -X -9 -r -u build/rpmBuild/com.ibm.icu.zip $relzipfiledir
>+popd
> 
> %install
> %__rm -rf %{buildroot}
>@@ -68,6 +125,14 @@ Javadoc for %{name}.
> %__cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
> %__ln_s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
> 
>+# eclipse
>+install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_lib_base}
>+
>+pushd eclipseProjects
>+# FIXME: icu4j generates res_index.txt differently on different arches - possible libgcj bug.
>+unzip -qq -d $RPM_BUILD_ROOT%{eclipse_lib_base}/.. build/rpmBuild/com.ibm.icu.zip
>+popd
>+
> %if %{gcj_support}
> %{_bindir}/aot-compile-rpm
> %endif
>@@ -109,7 +174,19 @@ fi
> %ghost %doc %{_javadocdir}/%{name}
> %doc %{_javadocdir}/%{name}-%{version}
> 
>+%files eclipse
>+%defattr(0644,root,root,0755)
>+%{eclipse_lib_base}/features/*
>+%{eclipse_lib_base}/plugins/*
>+%if %{gcj_support}
>+%{_libdir}/gcj/%{name}/com.ibm.icu*
>+%endif
>+
>+
> %changelog
>+* Fri Jan 05 2007 Jeff Johnston  <jjohnstn@rdhat.com> 0:3.4.5-2jpp_1fc
>+- Add eclipse sub-package to create plugins.
>+
> * Mon Sep 04 2006 Ben Konrath <bkonrath@redhat.com> 0:3.4.5-1jpp_1fc
> - 3.4.5.
> - Add GCJ support with spec-convert-gcj-1.6.

Actions: View | Diff

Attachments on bug 199504: 144927 | 145093 | 146254