rpms/icu4j/F-8 icu4j-updatetimestamp.patch, 1.1, 1.2 icu4j.spec, 1.6, 1.7

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/pkgs/rpms/icu4j/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2056

Modified Files:
	icu4j-updatetimestamp.patch icu4j.spec 
Log Message:
* Tue Nov 13 2007 Andrew Overholt <overholt at redhat.com> 3.6.1-1jpp.5
- Bump release and change updatetimestamp patch to have DOS
  line-endings.

icu4j-updatetimestamp.patch:

Index: icu4j-updatetimestamp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/F-8/icu4j-updatetimestamp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icu4j-updatetimestamp.patch	28 Sep 2007 20:27:07 -0000	1.1
+++ icu4j-updatetimestamp.patch	13 Nov 2007 22:00:43 -0000	1.2
@@ -1,10 +1,9 @@
-# release-3-6-1-eclipse331-20070906
+diff -ur icu4j-3.6.1/build.properties icu4j-3.6.1/build.properties
 --- icu4j-3.6.1/build.properties	2007-04-27 11:42:26.000000000 -0400
-+++ icu4j-3.6.1/build.properties	2007-09-06 15:18:03.000000000 -0400
++++ icu4j-3.6.1/build.properties	2007-11-13 11:29:21.000000000 -0500
 @@ -14,4 +14,4 @@
- copyright=Copyright (c) 2000-2007, International Business Machines Corporation and others.  All Rights Reserved.
- corp=IBM Corporation
- copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2007. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.
--icu4j.eclipse.build.version.string=3.6.1.v20070417
-+icu4j.eclipse.build.version.string=3.6.1.v20070906
-
+ copyright=Copyright (c) 2000-2007, International Business Machines Corporation and others.  All Rights Reserved.
+ corp=IBM Corporation
+ copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2007. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.
+-icu4j.eclipse.build.version.string=3.6.1.v20070417
++icu4j.eclipse.build.version.string=3.6.1.v20070906


Index: icu4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icu4j/F-8/icu4j.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- icu4j.spec	28 Sep 2007 20:27:07 -0000	1.6
+++ icu4j.spec	13 Nov 2007 22:00:43 -0000	1.7
@@ -48,7 +48,7 @@
 
 Name:           icu4j
 Version:        3.6.1
-Release:        1jpp.4%{?dist}
+Release:        1jpp.5%{?dist}
 Epoch:          0
 Summary:        International Components for Unicode for Java
 License:        MIT style 
@@ -57,6 +57,8 @@
 Source0:	http://download.icu-project.org/files/icu4j/3.6.1/icu4jsrc_3_6_1.jar
 Patch0:         %{name}-crosslink.patch
 Patch1:         %{name}-disable-javadocs.patch
+# Take from tag release-3-6-1-eclipse331-20070906
+# Patch made using Eclipse won't apply due to Windows line ending issue.
 Patch2:         %{name}-updatetimestamp.patch
 BuildRequires:  ant
 BuildRequires:  java-javadoc
@@ -233,6 +235,10 @@
 %endif
 
 %changelog
+* Tue Nov 13 2007 Andrew Overholt <overholt at redhat.com> 3.6.1-1jpp.5
+- Bump release and change updatetimestamp patch to have DOS
+  line-endings.
+
 * Fri Sep 28 2007 Andrew Overholt <overholt at redhat.com> 3.6.1-1jpp.4
 - Update timestamp to match Eclipse 3.3.1 release.