From 0e9c0fcf20a9cc8250e80a8347edbda9f08db61d Mon Sep 17 00:00:00 2001 From: mharmsen Date: Tue, 15 Dec 2009 03:36:18 +0000 Subject: Removed 'exceptions' from License. git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@889 c9f7a03b-bd48-0410-a16d-cbbf54688b0b --- pki/base/console/LICENSE | 20 -------------------- pki/base/kra/LICENSE | 20 -------------------- pki/base/manage/LICENSE | 20 -------------------- pki/base/migrate/LICENSE | 20 -------------------- pki/base/ocsp/LICENSE | 20 -------------------- pki/base/ra/LICENSE | 20 -------------------- pki/base/tks/LICENSE | 20 -------------------- pki/base/tps/LICENSE | 11 ++--------- pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec | 2 ++ pki/dogtag/common-ui/dogtag-pki-common-ui.spec | 2 ++ pki/dogtag/console-ui/LICENSE | 20 -------------------- pki/dogtag/console-ui/dogtag-pki-console-ui.spec | 7 +++++-- pki/dogtag/console/pki-console.spec | 7 +++++-- pki/dogtag/java-tools/pki-java-tools.spec | 3 +++ pki/dogtag/kra-ui/LICENSE | 20 -------------------- pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec | 7 +++++-- pki/dogtag/kra/pki-kra.spec | 7 +++++-- pki/dogtag/manage/pki-manage.spec | 7 +++++-- pki/dogtag/migrate/pki-migrate.spec | 7 +++++-- pki/dogtag/ocsp-ui/LICENSE | 20 -------------------- pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec | 7 +++++-- pki/dogtag/ocsp/pki-ocsp.spec | 7 +++++-- pki/dogtag/osutil/osutil.spec | 4 ++++ pki/dogtag/ra-ui/LICENSE | 20 -------------------- pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec | 7 +++++-- pki/dogtag/ra/pki-ra.spec | 7 +++++-- pki/dogtag/symkey/symkey.spec | 3 +++ pki/dogtag/tks-ui/LICENSE | 20 -------------------- pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec | 7 +++++-- pki/dogtag/tks/pki-tks.spec | 7 +++++-- pki/dogtag/tps-ui/LICENSE | 20 -------------------- pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec | 7 +++++-- pki/dogtag/tps/pki-tps.spec | 8 ++++++-- pki/dogtag/util/pki-util.spec | 3 +++ 34 files changed, 90 insertions(+), 297 deletions(-) diff --git a/pki/base/console/LICENSE b/pki/base/console/LICENSE index e36f2269a..e281f4362 100644 --- a/pki/base/console/LICENSE +++ b/pki/base/console/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/base/kra/LICENSE b/pki/base/kra/LICENSE index e36f2269a..e281f4362 100644 --- a/pki/base/kra/LICENSE +++ b/pki/base/kra/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/base/manage/LICENSE b/pki/base/manage/LICENSE index e36f2269a..e281f4362 100644 --- a/pki/base/manage/LICENSE +++ b/pki/base/manage/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/base/migrate/LICENSE b/pki/base/migrate/LICENSE index e36f2269a..e281f4362 100644 --- a/pki/base/migrate/LICENSE +++ b/pki/base/migrate/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/base/ocsp/LICENSE b/pki/base/ocsp/LICENSE index e36f2269a..e281f4362 100644 --- a/pki/base/ocsp/LICENSE +++ b/pki/base/ocsp/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/base/ra/LICENSE b/pki/base/ra/LICENSE index e36f2269a..e281f4362 100644 --- a/pki/base/ra/LICENSE +++ b/pki/base/ra/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/base/tks/LICENSE b/pki/base/tks/LICENSE index e36f2269a..e281f4362 100644 --- a/pki/base/tks/LICENSE +++ b/pki/base/tks/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/base/tps/LICENSE b/pki/base/tps/LICENSE index e9c49d37e..e2391a711 100644 --- a/pki/base/tps/LICENSE +++ b/pki/base/tps/LICENSE @@ -4,20 +4,13 @@ the Free Software Foundation; version 2.1 of the License. This Program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -You should have received a copy of the GNU General Public License along +You should have received a copy of the GNU Lesser 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 Lesser General Public License ("Non-LGPL Code") and to distribute -linked combinations including the two, without the reverse engineering -permission set forth in Section 6 of the LGPL, subject to the -limitations in this paragraph. - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 diff --git a/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec b/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec index 43fb2651a..a5da1627a 100644 --- a/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec +++ b/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec @@ -54,8 +54,10 @@ rm -rf %{buildroot} %changelog * Mon Dec 14 2009 Kevin Wright 1.3.0-3 - Removed 'with exceptions' from License + * Mon Nov 2 2009 Ade Lee 1.3.0-2 - Bugzilla Bug #522208 - Packaging for Fedora Dogtag - Take ownership of directories + * Tue Oct 13 2009 Ade Lee 1.3.0-1 - Bugzilla Bug #522208 - Packaging for Fedora Dogtag diff --git a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec index 97d6ef20a..9ca58f769 100644 --- a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec +++ b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec @@ -54,8 +54,10 @@ rm -rf %{buildroot} %changelog * Mon Dec 14 2009 Kevin Wright 1.3.0-3 - Removed 'with exceptions' from License + * Mon Nov 2 2009 Matthew Harmsen 1.3.0-2 - Bugzilla Bug #522204 - Packaging for Fedora Dogtag PKI - Take ownership of directories + * Tue Oct 13 2009 Ade Lee 1.3.0-1 - Bugzilla Bug #522204 - Packaging for Fedora Dogtag PKI diff --git a/pki/dogtag/console-ui/LICENSE b/pki/dogtag/console-ui/LICENSE index e36f2269a..e281f4362 100644 --- a/pki/dogtag/console-ui/LICENSE +++ b/pki/dogtag/console-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/console-ui/dogtag-pki-console-ui.spec b/pki/dogtag/console-ui/dogtag-pki-console-ui.spec index 46b70456f..0877829b2 100644 --- a/pki/dogtag/console-ui/dogtag-pki-console-ui.spec +++ b/pki/dogtag/console-ui/dogtag-pki-console-ui.spec @@ -1,9 +1,9 @@ Name: dogtag-pki-console-ui Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - PKI Console User Interface URL: http://pki.fedoraproject.org/ -License: GPLv2 with exceptions +License: GPLv2 Group: System Environment/Base BuildArch: noarch @@ -60,5 +60,8 @@ rm -rf %{buildroot} %{_javadir}/pki %changelog +* Mon Dec 14 2009 Kevin Wright 1.3.0-2 +- Removed 'with exceptions' from License + * Wed Oct 14 2009 Ade Lee 1.3.0-1 - Bugzilla Bug #X - Packaging for Fedora Dogtag diff --git a/pki/dogtag/console/pki-console.spec b/pki/dogtag/console/pki-console.spec index 78cfd81a9..ec2a00300 100644 --- a/pki/dogtag/console/pki-console.spec +++ b/pki/dogtag/console/pki-console.spec @@ -1,9 +1,9 @@ Name: pki-console Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - PKI Console URL: http://pki.fedoraproject.org/ -License: GPLv2 with exceptions +License: GPLv2 Group: System Environment/Shells BuildArch: noarch @@ -63,5 +63,8 @@ rm -rf %{buildroot} %{_javadir}/pki %changelog +* Mon Dec 14 2009 Kevin Wright 1.3.0-2 +- Removed 'with exceptions' from License + * Thu Oct 15 2009 Ade Lee 1.3.0-1 - Bugzilla Bug #X - Packaging for Fedora Dogtag diff --git a/pki/dogtag/java-tools/pki-java-tools.spec b/pki/dogtag/java-tools/pki-java-tools.spec index a2e594fcf..3cffbc716 100644 --- a/pki/dogtag/java-tools/pki-java-tools.spec +++ b/pki/dogtag/java-tools/pki-java-tools.spec @@ -78,12 +78,15 @@ rm -rf %{buildroot} %changelog * Mon Dec 14 2009 Kevin Wright 1.3.0-4 - Removed 'with exceptions' from License + * Tue Nov 24 2009 Matthew Harmsen 1.3.0-3 - Bugzilla Bug #521995 - Packaging for Fedora Dogtag PKI - Use "_javadir" macro when appropriate - Move jar file to top-level + * Mon Nov 2 2009 Matthew Harmsen 1.3.0-2 - Bugzilla Bug #521995 - Packaging for Fedora Dogtag PKI - Take ownership of directories + * Tue Oct 13 2009 Ade Lee 1.3.0-1 - Bugzilla Bug #521995 - Packaging for Fedora Dogtag PKI diff --git a/pki/dogtag/kra-ui/LICENSE b/pki/dogtag/kra-ui/LICENSE index e36f2269a..e281f4362 100644 --- a/pki/dogtag/kra-ui/LICENSE +++ b/pki/dogtag/kra-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/kra-ui/dogtag-pki-kra-ui.spec b/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec index 8ce0bda5c..99cac4cc9 100644 --- a/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec +++ b/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec @@ -1,9 +1,9 @@ Name: dogtag-pki-kra-ui Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - Data Recovery Authority 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 1.3.0-2 +- Removed 'with exceptions' from License + * Thu Oct 15 2009 Ade Lee 1.3.0-1 - Bugzilla Bug #X - Packaging for Fedora Dogtag diff --git a/pki/dogtag/kra/pki-kra.spec b/pki/dogtag/kra/pki-kra.spec index 207b2005f..ca418c444 100644 --- a/pki/dogtag/kra/pki-kra.spec +++ b/pki/dogtag/kra/pki-kra.spec @@ -1,9 +1,9 @@ Name: pki-kra Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - Data Recovery Manager URL: http://pki.fedoraproject.org/ -License: GPLv2 with exceptions +License: GPLv2 Group: System Environment/Daemons BuildArch: noarch @@ -110,5 +110,8 @@ fi %{_datadir}/pki/kra/* %changelog +* Mon Dec 14 2009 Kevin Wright 1.3.0-2 +- Removed 'with exceptions' from License + * Thu Oct 15 2009 Ade Lee 1.3.0-1 - Bugzilla Bug #X - Packaging for Fedora Dogtag diff --git a/pki/dogtag/manage/pki-manage.spec b/pki/dogtag/manage/pki-manage.spec index de1d6d9fd..96e59e76f 100644 --- a/pki/dogtag/manage/pki-manage.spec +++ b/pki/dogtag/manage/pki-manage.spec @@ -1,9 +1,9 @@ Name: pki-manage Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - PKI Uninstall Scripts URL: http://pki.fedoraproject.org/ -License: GPLv2 with exceptions +License: GPLv2 Group: System Environment/Shells BuildArch: noarch @@ -55,5 +55,8 @@ rm -rf %{buildroot} %{_bindir}/* %changelog +* Mon Dec 14 2009 Kevin Wright 1.3.0-2 +- Removed 'with exceptions' from License + * Fri Oct 16 2009 Matthew Harmsen 1.3.0-1 - Bugzilla Bug #X - Packaging for Fedora Dogtag PKI diff --git a/pki/dogtag/migrate/pki-migrate.spec b/pki/dogtag/migrate/pki-migrate.spec index 6a46e863a..3783edfca 100644 --- a/pki/dogtag/migrate/pki-migrate.spec +++ b/pki/dogtag/migrate/pki-migrate.spec @@ -1,9 +1,9 @@ Name: pki-migrate Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - PKI Migration Scripts URL: http://pki.fedoraproject.org/ -License: GPLv2 with exceptions +License: GPLv2 Group: System Environment/Shells # Suppress automatic 'requires' and 'provisions' of multi-platform 'binaries' @@ -68,5 +68,8 @@ rm -rf %{buildroot} %{_datadir}/pki/migrate/* %changelog +* Mon Dec 14 2009 Kevin Wright 1.3.0-2 +- Removed 'with exceptions' from License + * Fri Oct 16 2009 Matthew Harmsen 1.3.0-1 - Bugzilla Bug #X - Packaging for Fedora Dogtag PKI diff --git a/pki/dogtag/ocsp-ui/LICENSE b/pki/dogtag/ocsp-ui/LICENSE index e36f2269a..e281f4362 100644 --- a/pki/dogtag/ocsp-ui/LICENSE +++ b/pki/dogtag/ocsp-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/ocsp-ui/dogtag-pki-ocsp-ui.spec b/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec index 5c4d417df..f521c2542 100644 --- a/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec +++ b/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec @@ -1,9 +1,9 @@ Name: dogtag-pki-ocsp-ui Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - Online Certificate Status Protocol User Interface URL: http://pki.fedoraproject.org/ -License: GPLv2 with exceptions +License: GPLv2 Group: System Environment/Base BuildArch: noarch @@ -53,5 +53,8 @@ rm -rf %{buildroot} %{_datadir}/pki/* %changelog +* Mon Dec 14 2009 Kevin Wright 1.3.0-2 +- Removed 'with exceptions' from License + * Thu Oct 15 2009 Ade Lee 1.3.0-1 - Bugzilla Bug #X - Packaging for Fedora Dogtag diff --git a/pki/dogtag/ocsp/pki-ocsp.spec b/pki/dogtag/ocsp/pki-ocsp.spec index 5487ebadd..a58384d63 100644 --- a/pki/dogtag/ocsp/pki-ocsp.spec +++ b/pki/dogtag/ocsp/pki-ocsp.spec @@ -1,9 +1,9 @@ Name: pki-ocsp Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - Online Certificate Status Protocol Manager URL: http://pki.fedoraproject.org/ -License: GPLv2 with exceptions +License: GPLv2 Group: System Environment/Daemons BuildArch: noarch @@ -119,5 +119,8 @@ fi %{_datadir}/pki/ocsp/* %changelog +* Mon Dec 14 2009 Kevin Wright 1.3.0-2 +- Removed 'with exceptions' from License + * Thu Oct 15 2009 Ade Lee 1.3.0-1 - Bugzilla Bug #X - Packaging for Fedora Dogtag diff --git a/pki/dogtag/osutil/osutil.spec b/pki/dogtag/osutil/osutil.spec index 284a85700..0b22b04f0 100644 --- a/pki/dogtag/osutil/osutil.spec +++ b/pki/dogtag/osutil/osutil.spec @@ -70,12 +70,16 @@ rm -rf %{buildroot} %changelog * Mon Dec 14 2009 Kevin Wright 1.3.1-1 - Removed 'with exceptions' from License + * Fri Oct 30 2009 Matthew Harmsen 1.3.0-3 - Bugzilla Bug #521983 - New package for Dogtag PKI: osutil - Removed LICENSE logic from installation section - Take ownership of library directory + * Tue Oct 27 2009 Matthew Harmsen 1.3.0-2 + - Bugzilla Bug #521983 - New package for Dogtag PKI: osutil - Complied with Fedora JNI packaging logic * Thu Oct 8 2009 Matthew Harmsen 1.3.0-1 + - Bugzilla Bug #521983 - New package for Dogtag PKI: osutil diff --git a/pki/dogtag/ra-ui/LICENSE b/pki/dogtag/ra-ui/LICENSE index e36f2269a..e281f4362 100644 --- a/pki/dogtag/ra-ui/LICENSE +++ b/pki/dogtag/ra-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/ra-ui/dogtag-pki-ra-ui.spec b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec index 878e663ad..631390f1e 100644 --- a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec +++ b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec @@ -1,9 +1,9 @@ Name: dogtag-pki-ra-ui Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - Registration Authority 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 1.3.0-2 +- Removed 'with exceptions' from License + * Fri Oct 16 2009 Ade Lee 1.3.0-1 - Bugzilla Bug #X - Fedora Packaging Changes diff --git a/pki/dogtag/ra/pki-ra.spec b/pki/dogtag/ra/pki-ra.spec index d7e300bc5..fe0b1dcb1 100644 --- a/pki/dogtag/ra/pki-ra.spec +++ b/pki/dogtag/ra/pki-ra.spec @@ -1,9 +1,9 @@ Name: pki-ra Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - Registration Authority URL: http://pki.fedoraproject.org/ -License: GPLv2 with exceptions +License: GPLv2 Group: System Environment/Daemons BuildArch: noarch @@ -99,5 +99,8 @@ fi %{_datadir}/pki/ra/* %changelog +* Mon Dec 14 2009 Kevin Wright 1.3.0-2 +- Removed 'with exceptions' from License + * Fri Oct 16 2009 Ade Lee 1.3.0-1 - Bugzilla Bug #X - Fedora Packaging Changes diff --git a/pki/dogtag/symkey/symkey.spec b/pki/dogtag/symkey/symkey.spec index 1567562eb..654f05046 100644 --- a/pki/dogtag/symkey/symkey.spec +++ b/pki/dogtag/symkey/symkey.spec @@ -72,12 +72,15 @@ rm -rf %{buildroot} %changelog * Mon Dec 14 2009 Kevin Wright 1.3.1-1 - Removed 'with exceptions' from License + * Fri Oct 30 2009 Matthew Harmsen 1.3.0-3 - Bugzilla Bug #522272 - New Package for Dogtag PKI: symkey - Removed LICENSE logic from installation section - Take ownership of library directory + * Tue Oct 27 2009 Matthew Harmsen 1.3.0-2 - Bugzilla Bug #522272 - New Package for Dogtag PKI: symkey - Complied with Fedora JNI packaging logic + * Mon Oct 12 2009 Matthew Harmsen 1.3.0-1 - Bugzilla Bug #522272 - New Package for Dogtag PKI: symkey diff --git a/pki/dogtag/tks-ui/LICENSE b/pki/dogtag/tks-ui/LICENSE index e36f2269a..e281f4362 100644 --- a/pki/dogtag/tks-ui/LICENSE +++ b/pki/dogtag/tks-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/tks-ui/dogtag-pki-tks-ui.spec b/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec index 8e8be0427..e9dcc7d30 100644 --- a/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec +++ b/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec @@ -1,9 +1,9 @@ Name: dogtag-pki-tks-ui Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - Token Key Service 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 1.3.0-2 +- Removed 'with exceptions' from License + * Fri Oct 16 2009 Ade Lee 1.3.0-1 - Bugzilla Bug #X - Packaging for Fedora Dogtag diff --git a/pki/dogtag/tks/pki-tks.spec b/pki/dogtag/tks/pki-tks.spec index 3306f720c..01cb6de81 100644 --- a/pki/dogtag/tks/pki-tks.spec +++ b/pki/dogtag/tks/pki-tks.spec @@ -1,9 +1,9 @@ Name: pki-tks Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - Token Key Service URL: http://pki.fedoraproject.org/ -License: GPLv2 with exceptions +License: GPLv2 Group: System Environment/Daemons BuildArch: noarch @@ -114,5 +114,8 @@ fi %{_datadir}/pki/tks/* %changelog +* Mon Dec 14 2009 Kevin Wright 1.3.0-2 +- Removed 'with exceptions' from License + * Fri Oct 16 2009 Ade Lee 1.3.0-1 - Bugzilla Bug #X - Packaging for Fedora Dogtag 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 1.3.0-2 +- Removed 'with exceptions' from License + * Fri Oct 16 2009 Ade Lee 1.3.0-1 - Bugzilla Bug #X - Fedora Packaging Changes diff --git a/pki/dogtag/tps/pki-tps.spec b/pki/dogtag/tps/pki-tps.spec index 2692dcfaa..6a87d960d 100644 --- a/pki/dogtag/tps/pki-tps.spec +++ b/pki/dogtag/tps/pki-tps.spec @@ -1,9 +1,9 @@ Name: pki-tps Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dogtag Certificate System - Token Processing System URL: http://pki.fedoraproject.org/ -License: LGPLv2 with exceptions +License: LGPLv2 Group: System Environment/Daemons # Suppress '/usr/lib/rpm/perl.req' and '/usr/lib/rpm/perl.prov' @@ -130,9 +130,13 @@ fi %{_datadir}/pki/tps/ %changelog +* Mon Dec 14 2009 Kevin Wright 1.3.0-3 +- Removed 'with exceptions' from License + * Mon Nov 2 2009 Matthew Harmsen 1.3.0-2 - Bugzilla Bug #X - Packaging for Fedora Dogtag PKI - Prepended directory path in front of setup_package - Take ownership of pki tps directory. + * Fri Oct 16 2009 Matthew Harmsen 1.3.0-1 - Bugzilla Bug #X - Packaging for Fedora Dogtag PKI diff --git a/pki/dogtag/util/pki-util.spec b/pki/dogtag/util/pki-util.spec index 17166eec1..8b3ee59b6 100644 --- a/pki/dogtag/util/pki-util.spec +++ b/pki/dogtag/util/pki-util.spec @@ -86,10 +86,13 @@ rm -rf %{buildroot} * Mon Dec 14 2009 Kevin Wright 1.3.0-4 - Removed 'with exceptions' from License * Tue Nov 24 2009 Matthew Harmsen 1.3.0-3 + - Bugzilla Bug #521989 - packaging for Fedora Dogtag - Use "_javadir" macro when appropriate * Mon Nov 2 2009 Matthew Harmsen 1.3.0-2 + - Bugzilla Bug #521989 - packaging for Fedora Dogtag - Take ownership of directories * Tue Oct 13 2009 Ade Lee 1.3.0-1 + - Bugzilla Bug #521989 - packaging for Fedora Dogtag -- cgit