diff options
author | James Turnbull <james@lovedthanlost.net> | 2010-12-28 04:43:16 +1100 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2011-04-11 07:55:12 +1000 |
commit | d2145d9a02ce1802ceb44f0cf99090af62cc4b71 (patch) | |
tree | 2a1fca7225bf7ef884296dbf00a0a1ad6959f6e9 /conf | |
parent | 50756588baad21d9b399051153274a89857433ef (diff) | |
download | puppet-d2145d9a02ce1802ceb44f0cf99090af62cc4b71.tar.gz puppet-d2145d9a02ce1802ceb44f0cf99090af62cc4b71.tar.xz puppet-d2145d9a02ce1802ceb44f0cf99090af62cc4b71.zip |
Fixed #5684 - Move to Apache 2.0 license
For details of why we're moving please see:
https://groups.google.com/d/topic/puppet-users/NuspYhMpE5o/discussion
Removed explicit GPL licenses where appropriate
Replaced selected GPL licenses with Apache 2.0
Replaced LICENSE with Apache 2.0
Updated README
Diffstat (limited to 'conf')
-rw-r--r-- | conf/redhat/puppet.spec | 2 | ||||
-rw-r--r-- | conf/solaris/pkginfo | 7 | ||||
-rw-r--r-- | conf/suse/puppet.spec | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec index e51af0a6b..26b2c9ba0 100644 --- a/conf/redhat/puppet.spec +++ b/conf/redhat/puppet.spec @@ -8,7 +8,7 @@ Name: puppet Version: 2.6.0 Release: 1%{?dist} Summary: A network tool for managing many disparate systems -License: GPLv2+ +License: Apache 2.0 URL: http://puppetlabs.com Source0: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz Source1: http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.sign diff --git a/conf/solaris/pkginfo b/conf/solaris/pkginfo index 7f7bb9736..14a2f0a79 100644 --- a/conf/solaris/pkginfo +++ b/conf/solaris/pkginfo @@ -1,7 +1,6 @@ PKG=CSWpuppet NAME=puppet - System Automation Framework -VERSION=0.23.0 +VERSION=2.7.0 CATEGORY=application -VENDOR=http://reductivelabs.com/projects/puppet -HOTLINE=http://reductivelabs.com/cgi-bin/puppet.cgi -EMAIL=luke@madstop.com +VENDOR=http://projects.puppetlabs.com/projects/puppet +EMAIL=luke@puppetlabs.com diff --git a/conf/suse/puppet.spec b/conf/suse/puppet.spec index 777f6a4b6..2a5b9f4db 100644 --- a/conf/suse/puppet.spec +++ b/conf/suse/puppet.spec @@ -6,7 +6,7 @@ Summary: A network tool for managing many disparate systems Name: puppet Version: 2.6.1 Release: 1%{?dist} -License: GPL +License: Apache 2.0 Group: Productivity/Networking/System URL: http://puppetlabs.com/projects/puppet/ |