--- a/icu/icu.spec	Fri Aug 05 17:50:38 2011 +0900
+++ b/icu/icu.spec	Thu Sep 15 17:49:18 2011 +0200
@@ -182,6 +182,8 @@
 cp %SOURCE7 ${RPM_BUILD_ROOT}/usr/share/man/man3lib
 cp %SOURCE8 ${RPM_BUILD_ROOT}/usr/share/man/man3lib
 
+# removing CDDL from copies of source/text files delivered to the binary product
+(cd ${RPM_BUILD_ROOT}; ggrep -rlF 'CDDL HEADER START' . 2>/dev/null|xargs perl -i -ne 'print unless /CDDL HEADER START/ .. /CDDL HEADER END/')
 
 %files
 %defattr(-, root, bin)

--- a/icu/libicudata.3lib	Fri Aug 05 17:50:38 2011 +0900
+++ b/icu/libicudata.3lib	Thu Sep 15 17:49:18 2011 +0200
@@ -1,8 +1,10 @@
 '\" te
 .\" Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+.\" CDDL HEADER START
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.\" CDDL HEADER END
 .TH libicudata 3LIB "9 Feb 2011" "SunOS 5.11" "Interface Libraries"
 
 .SH NAME

--- a/icu/libicui18n.3lib	Fri Aug 05 17:50:38 2011 +0900
+++ b/icu/libicui18n.3lib	Thu Sep 15 17:49:18 2011 +0200
@@ -1,8 +1,10 @@
 '\" te
 .\" Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+.\" CDDL HEADER START
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.\" CDDL HEADER END
 .TH libicudata 3LIB "9 Feb 2011" "SunOS 5.11" "Interface Libraries"
 
 .SH NAME

--- a/icu/libicuio.3lib	Fri Aug 05 17:50:38 2011 +0900
+++ b/icu/libicuio.3lib	Thu Sep 15 17:49:18 2011 +0200
@@ -1,8 +1,10 @@
 '\" te
 .\" Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+.\" CDDL HEADER START
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.\" CDDL HEADER END
 .TH libicudata 3LIB "9 Feb 2011" "SunOS 5.11" "Interface Libraries"
 
 .SH NAME

--- a/icu/libicule.3lib	Fri Aug 05 17:50:38 2011 +0900
+++ b/icu/libicule.3lib	Thu Sep 15 17:49:18 2011 +0200
@@ -1,8 +1,10 @@
 '\" te
 .\" Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+.\" CDDL HEADER START
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.\" CDDL HEADER END
 .TH libicudata 3LIB "9 Feb 2011" "SunOS 5.11" "Interface Libraries"
 
 .SH NAME

--- a/icu/libiculx.3lib	Fri Aug 05 17:50:38 2011 +0900
+++ b/icu/libiculx.3lib	Thu Sep 15 17:49:18 2011 +0200
@@ -1,8 +1,10 @@
 '\" te
 .\" Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+.\" CDDL HEADER START
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.\" CDDL HEADER END
 .TH libicudata 3LIB "9 Feb 2011" "SunOS 5.11" "Interface Libraries"
 
 .SH NAME

--- a/icu/libicutu.3lib	Fri Aug 05 17:50:38 2011 +0900
+++ b/icu/libicutu.3lib	Thu Sep 15 17:49:18 2011 +0200
@@ -1,8 +1,10 @@
 '\" te
 .\" Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+.\" CDDL HEADER START
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.\" CDDL HEADER END
 .TH libicudata 3LIB "9 Feb 2011" "SunOS 5.11" "Interface Libraries"
 
 .SH NAME

--- a/icu/libicuuc.3lib	Fri Aug 05 17:50:38 2011 +0900
+++ b/icu/libicuuc.3lib	Thu Sep 15 17:49:18 2011 +0200
@@ -1,8 +1,10 @@
 '\" te
 .\" Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+.\" CDDL HEADER START
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.\" CDDL HEADER END
 .TH libicudata 3LIB "9 Feb 2011" "SunOS 5.11" "Interface Libraries"
 
 .SH NAME