rpms/icu4j/devel icu4j.spec, 1.23, 1.24 sources, 1.5, 1.6 .cvsignore, 1.5, 1.6 icu4j-individualsourcebundle.patch, 1.1, NONE icu4j-disable-javadocs.patch, 1.1, NONE icu4j-updatetimestamp.patch, 1.4, NONE

Thu Jul 8 13:26:02 UTC 2010

Author: akurtakov

Update of /cvs/pkgs/rpms/icu4j/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10129/devel

Modified Files:
	icu4j.spec sources .cvsignore 
Removed Files:
	icu4j-individualsourcebundle.patch 
	icu4j-disable-javadocs.patch icu4j-updatetimestamp.patch 
Log Message:
Update to 4.2.1.


Index: icu4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/icu4j.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24

--- icu4j.spec	5 Feb 2010 15:01:03 -0000	1.23
+++ icu4j.spec	8 Jul 2010 13:26:02 -0000	1.24
@@ -28,38 +28,31 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define with_eclipse 1
+%global with_eclipse 1
 
-%define section free
+%global section free
 
-%define eclipse_base            %{_libdir}/eclipse
+%global eclipse_base            %{_libdir}/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}
-%define eclipse_arch    x86
+%global eclipse_arch    x86
 %else
-%define eclipse_arch   %{_arch}
+%global eclipse_arch   %{_arch}
 %endif
 
 Name:           icu4j
-Version:        4.0.1
-Release:        5%{?dist}
+Version:        4.2.1
+Release:        1%{?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
-Group:          Development/Libraries/Java
-Source0:        http://download.icu-project.org/files/icu4j/4.0.1/icu4j-4_0_1-src.jar
-Source1:        http://repo2.maven.org/maven2/com/ibm/icu/icu4j/%{version}/%{name}-%{version}.pom
+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
 Patch0:         %{name}-crosslink.patch
-# Update the MANIFEST.MF to have the same qualifier in the bundle as is
-# in Eclipse's Orbit project
-Patch2:         %{name}-updatetimestamp.patch
-# Bundle the source instead of having it be an exploded directory.  This
-# doesn't work with a 3.3 Eclipse SDK but will with a 3.4 so we'll have
-# to rebuild once we get 3.4 in.
-Patch3:         %{name}-individualsourcebundle.patch
 # PDE Build is in a location the upstream build.xml doesn't check
 Patch4:         %{name}-pdebuildlocation.patch
 BuildRequires:  ant >= 1.7.0
@@ -76,7 +69,7 @@ Requires(postun): jpackage-utils
 Requires:       java >= 1:1.6.0
 %if %{with_eclipse}
 BuildRequires:  eclipse-pde >= 0:3.2.1
-%define         debug_package %{nil}
+%global         debug_package %{nil}
 %else
 BuildArch:      noarch
 %endif
@@ -99,7 +92,7 @@ Java text and internationalization API d
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 Requires:       jpackage-utils
 Requires:       java-javadoc >= 1:1.6.0
 
@@ -109,7 +102,7 @@ Javadoc for %{name}.
 %if %{with_eclipse}
 %package eclipse
 Summary:        Eclipse plugin for %{name}
-Group:          Text Editors/Integrated Development Environments (IDE) 
+Group:          Development/Libraries
 Requires:       jpackage-utils
 
 %description eclipse
@@ -120,8 +113,6 @@ Eclipse plugin support for %{name}.
 %prep
 %setup -q -c
 %patch0 -p0
-#%patch2 -p0
-#%patch3 -p0
 %patch4 -p0
 
 cp %{SOURCE1} .
@@ -140,7 +131,7 @@ sed --in-place "s:/usr/lib:%{_libdir}:g"
   %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.0.1.v20090415 \
+    -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
@@ -168,7 +159,7 @@ unzip -qq -d %{buildroot}/%{eclipse_base
 
 # maven stuff
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-cp %{name}-%{version}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+cp %{name}-4.0.1.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 %add_to_maven_depmap com.ibm.icu %{name} %{version} JPP %{name}
 
 %post
@@ -181,19 +172,19 @@ cp %{name}-%{version}.pom $RPM_BUILD_ROO
 %__rm -rf %{buildroot}
 
 %files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc license.html readme.html APIChangeReport.html
 %{_javadir}/%{name}*.jar
 %{_mavendepmapfragdir}/*
 %{_mavenpomdir}/*.pom
 
 %files javadoc
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc %{_javadocdir}/*
 
 %if %{with_eclipse}
 %files eclipse
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %dir %{_libdir}/eclipse
 %dir %{_libdir}/eclipse/features
 %dir %{_libdir}/eclipse/plugins
@@ -203,6 +194,9 @@ cp %{name}-%{version}.pom $RPM_BUILD_ROO
 %endif
 
 %changelog
+* Thu Jul 8 2010 Alexander Kurtakov <akurtako at redhat.com> 1:4.2.1-1
+- Update to 4.2.1.
+
 * Fri Feb  5 2010 Mary Ellen Foster <mefoster at gmail.com> 1:4.0.1-5
 - Add maven pom and depmap fragment
 
@@ -228,7 +222,7 @@ cp %{name}-%{version}.pom $RPM_BUILD_ROO
 * Mon Aug 11 2008 Andrew Overholt <overholt at redhat.com> 3.8.1-3
 - Get rid of eclipse_name macro
 - Rebuild with Eclipse 3.4 and put into Eclipse stuff into
-  %{_libdir}/eclipse
+  %%{_libdir}/eclipse
 - Remove now-unnecessary OSGi configuration dir patch
 - Add patch to point to PDE Build location
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Apr 2009 10:21:22 -0000	1.5
+++ sources	8 Jul 2010 13:26:02 -0000	1.6
@@ -1 +1 @@
-025b460faf49ddfde020580c48392069  icu4j-4_0_1-src.jar
+01f58c554dffce3b2365eec4c94ea921  icu4j-4_2_1-src.jar


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	8 Apr 2009 10:21:22 -0000	1.5
+++ .cvsignore	8 Jul 2010 13:26:02 -0000	1.6
@@ -1,2 +1,3 @@
 icu4j-3_8_1-src.jar
 icu4j-4_0_1-src.jar
+icu4j-4_2_1-src.jar


--- icu4j-individualsourcebundle.patch DELETED ---


--- icu4j-disable-javadocs.patch DELETED ---


--- icu4j-updatetimestamp.patch DELETED ---

