Removed 'exceptions' from License.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@889 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

2 files changed, 5 insertions, 22 deletions

diff --git a/pki/dogtag/tps-ui/LICENSE b/pki/dogtag/tps-ui/LICENSE
index e36f2269a..e281f4362 100644
--- a/pki/dogtag/tps-ui/LICENSE
+++ b/pki/dogtag/tps-ui/LICENSE
@@ -11,26 +11,6 @@ You should have received a copy of the GNU General Public License
 along with this Program; if not, write to the Free Software 
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  
-In addition, as a special exception, Red Hat, Inc. gives You the additional 
-right to link the code of this Program with code not covered under the GNU 
-General Public License ("Non-GPL Code") and to distribute linked combinations 
-including the two, subject to the limitations in this paragraph. Non-GPL 
-Code permitted under this exception must only link to the code of this 
-Program through those well defined interfaces identified in the file named 
-EXCEPTION found in the source code files (the "Approved Interfaces"). 
- 
-The files of Non-GPL Code may instantiate templates or use macros or inline
-functions from the Approved Interfaces without causing the resulting work to 
-be covered by the GNU General Public License. Only Red Hat, Inc. may make 
-changes or additions to the list of Approved Interfaces. You must obey the 
-GNU General Public License in all respects for all of the Program code and 
-other code used in conjunction with the Program except the Non-GPL Code 
-covered by this exception. If you modify this file, you may extend this 
-exception to your version of the file, but you are not obligated to do so. 
-If you do not wish to provide this exception without modification, you must 
-delete this exception statement from your version and license this file 
-solely under the GPL without exception.
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
index ed9acadd7..248491142 100644
--- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
+++ b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
@@ -1,9 +1,9 @@
 Name:           dogtag-pki-tps-ui
 Version:        1.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dogtag Certificate System - Token Processing System User Interface
 URL:            http://pki.fedoraproject.org/
-License:        GPLv2 with exceptions
+License:        GPLv2
 Group:          System Environment/Base
 
 BuildArch:      noarch
@@ -52,5 +52,8 @@ rm -rf %{buildroot}
 %{_datadir}/pki/*
 
 %changelog
+* Mon Dec 14 2009 Kevin Wright <kwright@redhat.com> 1.3.0-2
+- Removed 'with exceptions' from License
+
 * Fri Oct 16 2009 Ade Lee <alee@redhat.com> 1.3.0-1
 - Bugzilla Bug #X - Fedora Packaging Changes