--- a/ChangeLog	Thu Aug 12 04:25:46 2010 +0000
+++ b/ChangeLog	Fri Aug 13 03:25:24 2010 +0000
@@ -1,3 +1,8 @@
+2010-08-13  Lin Ma  <[email protected]>
+
+	* copyright/SUNWnwam-manager.copyright:
+	* specs/SUNWnwam-manager.spec: Remove CDDL from package.
+
 2010-08-12  Jeff Cai <[email protected]>
 
 	* base-specs/evolution-data-server.spec: Bump to 2.30.3

--- a/copyright/SUNWnwam-manager.copyright	Thu Aug 12 04:25:46 2010 +0000
+++ b/copyright/SUNWnwam-manager.copyright	Fri Aug 13 03:25:24 2010 +0000
@@ -4,13 +4,10 @@
 
 Licensing and copyright information for %{name}
 
-  License: Common Development And Distribution Licence Version 1.0
-
   You can find more information in the following directory:
   %{_pkg_docdir}
 
     AUTHORS: List of authors of nwam-manager
-    COPYING.bz2: CDDL
     ChangeLog.bz2: List of all changes and authors of nwam-manager
     README: More information about nwam-manager
 

--- a/specs/SUNWnwam-manager.spec	Thu Aug 12 04:25:46 2010 +0000
+++ b/specs/SUNWnwam-manager.spec	Fri Aug 13 03:25:24 2010 +0000
@@ -127,7 +127,7 @@
 %dir %attr(0755, root, bin) %{_mandir}/*
 %{_mandir}/*/*
 %doc -d nwam-manager-%{nwam_manager.version} AUTHORS README 
-%doc(bzip2) -d nwam-manager-%{nwam_manager.version} COPYING ChangeLog
+%doc(bzip2) -d nwam-manager-%{nwam_manager.version} ChangeLog
 %dir %attr (0755, root, other) %{_datadir}/doc
 
 %files root
@@ -147,6 +147,8 @@
 %endif
 
 %changelog
+* Fri Aug 13 2010 - [email protected]
+- Remove CDDL from package.
 * Fri Feb 24 2010 - [email protected]
 - Update for phase 1.0
 * Fri Apr  3 2009 - [email protected]