[rubygem-imagefactory-console/f16] Update license to ASL 2.0
Chris Lalancette
clalance at fedoraproject.org
Fri Sep 16 17:05:59 UTC 2011
commit 6cfdc99676cac53f0271e16c46ec04f52635ee57
Author: Chris Lalancette <clalance at redhat.com>
Date: Fri Sep 16 12:06:41 2011 -0400
Update license to ASL 2.0
Signed-off-by: Chris Lalancette <clalance at redhat.com>
fix-license.patch | 340 +++++++++++++++++++++++++++++++++++++
rubygem-imagefactory-console.spec | 23 ++-
2 files changed, 358 insertions(+), 5 deletions(-)
---
diff --git a/fix-license.patch b/fix-license.patch
new file mode 100644
index 0000000..ddb1364
--- /dev/null
+++ b/fix-license.patch
@@ -0,0 +1,340 @@
+diff -Nurp rubygem-imagefactory-console-0.4.0.orig/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/COPYING rubygem-imagefactory-console-0.4.0/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/COPYING
+--- rubygem-imagefactory-console-0.4.0.orig/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/COPYING 1969-12-31 19:00:00.000000000 -0500
++++ rubygem-imagefactory-console-0.4.0/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/COPYING 2011-09-16 12:48:16.592295082 -0400
+@@ -0,0 +1,161 @@
++Apache License
++
++Version 2.0, January 2004
++
++http://www.apache.org/licenses/
++
++TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
++
++1. Definitions.
++
++"License" shall mean the terms and conditions for use, reproduction, and
++distribution as defined by Sections 1 through 9 of this document.
++
++"Licensor" shall mean the copyright owner or entity authorized by the copyright
++owner that is granting the License.
++
++"Legal Entity" shall mean the union of the acting entity and all other entities
++that control, are controlled by, or are under common control with that entity.
++For the purposes of this definition, "control" means (i) the power, direct or
++indirect, to cause the direction or management of such entity, whether by
++contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
++outstanding shares, or (iii) beneficial ownership of such entity.
++
++"You" (or "Your") shall mean an individual or Legal Entity exercising
++permissions granted by this License.
++
++"Source" form shall mean the preferred form for making modifications, including
++but not limited to software source code, documentation source, and
++configuration files.
++
++"Object" form shall mean any form resulting from mechanical transformation or
++translation of a Source form, including but not limited to compiled object
++code, generated documentation, and conversions to other media types.
++
++"Work" shall mean the work of authorship, whether in Source or Object form,
++made available under the License, as indicated by a copyright notice that is
++included in or attached to the work (an example is provided in the Appendix
++below).
++
++"Derivative Works" shall mean any work, whether in Source or Object form, that
++is based on (or derived from) the Work and for which the editorial revisions,
++annotations, elaborations, or other modifications represent, as a whole, an
++original work of authorship. For the purposes of this License, Derivative Works
++shall not include works that remain separable from, or merely link (or bind by
++name) to the interfaces of, the Work and Derivative Works thereof.
++
++"Contribution" shall mean any work of authorship, including the original
++version of the Work and any modifications or additions to that Work or
++Derivative Works thereof, that is intentionally submitted to Licensor for
++inclusion in the Work by the copyright owner or by an individual or Legal
++Entity authorized to submit on behalf of the copyright owner. For the purposes
++of this definition, "submitted" means any form of electronic, verbal, or
++written communication sent to the Licensor or its representatives, including
++but not limited to communication on electronic mailing lists, source code
++control systems, and issue tracking systems that are managed by, or on behalf
++of, the Licensor for the purpose of discussing and improving the Work, but
++excluding communication that is conspicuously marked or otherwise designated in
++writing by the copyright owner as "Not a Contribution."
++
++"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
++of whom a Contribution has been received by Licensor and subsequently
++incorporated within the Work.
++
++2. Grant of Copyright License. Subject to the terms and conditions of this
++License, each Contributor hereby grants to You a perpetual, worldwide,
++non-exclusive, no-charge, royalty-free, irrevocable copyright license to
++reproduce, prepare Derivative Works of, publicly display, publicly perform,
++sublicense, and distribute the Work and such Derivative Works in Source or
++Object form.
++
++3. Grant of Patent License. Subject to the terms and conditions of this
++License, each Contributor hereby grants to You a perpetual, worldwide,
++non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this
++section) patent license to make, have made, use, offer to sell, sell, import,
++and otherwise transfer the Work, where such license applies only to those
++patent claims licensable by such Contributor that are necessarily infringed by
++their Contribution(s) alone or by combination of their Contribution(s) with the
++Work to which such Contribution(s) was submitted. If You institute patent
++litigation against any entity (including a cross-claim or counterclaim in a
++lawsuit) alleging that the Work or a Contribution incorporated within the Work
++constitutes direct or contributory patent infringement, then any patent
++licenses granted to You under this License for that Work shall terminate as of
++the date such litigation is filed.
++
++4. Redistribution. You may reproduce and distribute copies of the Work or
++Derivative Works thereof in any medium, with or without modifications, and in
++Source or Object form, provided that You meet the following conditions:
++
++You must give any other recipients of the Work or Derivative Works a copy of
++this License; and
++
++You must cause any modified files to carry prominent notices stating that You
++changed the files; and
++
++You must retain, in the Source form of any Derivative Works that You
++distribute, all copyright, patent, trademark, and attribution notices from the
++Source form of the Work, excluding those notices that do not pertain to any
++part of the Derivative Works; and
++
++If the Work includes a "NOTICE" text file as part of its distribution, then any
++Derivative Works that You distribute must include a readable copy of the
++attribution notices contained within such NOTICE file, excluding those notices
++that do not pertain to any part of the Derivative Works, in at least one of the
++following places: within a NOTICE text file distributed as part of the
++Derivative Works; within the Source form or documentation, if provided along
++with the Derivative Works; or, within a display generated by the Derivative
++Works, if and wherever such third-party notices normally appear. The contents
++of the NOTICE file are for informational purposes only and do not modify the
++License. You may add Your own attribution notices within Derivative Works that
++You distribute, alongside or as an addendum to the NOTICE text from the Work,
++provided that such additional attribution notices cannot be construed as
++modifying the License. You may add Your own copyright statement to Your
++modifications and may provide additional or different license terms and
++conditions for use, reproduction, or distribution of Your modifications, or for
++any such Derivative Works as a whole, provided Your use, reproduction, and
++distribution of the Work otherwise complies with the conditions stated in this
++License.
++
++5. Submission of Contributions. Unless You explicitly state otherwise, any
++Contribution intentionally submitted for inclusion in the Work by You to the
++Licensor shall be under the terms and conditions of this License, without any
++additional terms or conditions. Notwithstanding the above, nothing herein shall
++supersede or modify the terms of any separate license agreement you may have
++executed with Licensor regarding such Contributions.
++
++6. Trademarks. This License does not grant permission to use the trade names,
++trademarks, service marks, or product names of the Licensor, except as required
++for reasonable and customary use in describing the origin of the Work and
++reproducing the content of the NOTICE file.
++
++7. Disclaimer of Warranty. Unless required by applicable law or agreed to in
++writing, Licensor provides the Work (and each Contributor provides its
++Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++KIND, either express or implied, including, without limitation, any warranties
++or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
++PARTICULAR PURPOSE. You are solely responsible for determining the
++appropriateness of using or redistributing the Work and assume any risks
++associated with Your exercise of permissions under this License.
++
++8. Limitation of Liability. In no event and under no legal theory, whether in
++tort (including negligence), contract, or otherwise, unless required by
++applicable law (such as deliberate and grossly negligent acts) or agreed to in
++writing, shall any Contributor be liable to You for damages, including any
++direct, indirect, special, incidental, or consequential damages of any
++character arising as a result of this License or out of the use or inability to
++use the Work (including but not limited to damages for loss of goodwill, work
++stoppage, computer failure or malfunction, or any and all other commercial
++damages or losses), even if such Contributor has been advised of the
++possibility of such damages.
++
++9. Accepting Warranty or Additional Liability. While redistributing the Work or
++Derivative Works thereof, You may choose to offer, and charge a fee for,
++acceptance of support, warranty, indemnity, or other liability obligations
++and/or rights consistent with this License. However, in accepting such
++obligations, You may act only on Your own behalf and on Your sole
++responsibility, not on behalf of any other Contributor, and only if You agree
++to indemnify, defend, and hold each Contributor harmless for any liability
++incurred by, or claims asserted against, such Contributor by reason of your
++accepting any such warranty or additional liability.
++
++END OF TERMS AND CONDITIONS
+diff -Nurp rubygem-imagefactory-console-0.4.0.orig/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/lib/imagefactory/base_handler.rb rubygem-imagefactory-console-0.4.0/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/lib/imagefactory/base_handler.rb
+--- rubygem-imagefactory-console-0.4.0.orig/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/lib/imagefactory/base_handler.rb 2011-09-16 12:47:39.861755492 -0400
++++ rubygem-imagefactory-console-0.4.0/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/lib/imagefactory/base_handler.rb 2011-09-16 12:50:57.437018008 -0400
+@@ -1,21 +1,16 @@
++# Copyright 2011 Red Hat, Inc.
+ #
+-# Copyright (C) 2011 Red Hat, Inc.
+-# Written by Jason Guiditta <jguiditt at redhat.com>
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
+ #
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; version 2 of the License.
++# http://www.apache.org/licenses/LICENSE-2.0
+ #
+-# 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 for more details.
+-#
+-# 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., 51 Franklin Street, Fifth Floor, Boston,
+-# MA 02110-1301, USA. A copy of the GNU General Public License is
+-# also available at http://www.gnu.org/copyleft/gpl.html.
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
+
+ require 'logger'
+
+diff -Nurp rubygem-imagefactory-console-0.4.0.orig/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/lib/imagefactory/console.rb rubygem-imagefactory-console-0.4.0/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/lib/imagefactory/console.rb
+--- rubygem-imagefactory-console-0.4.0.orig/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/lib/imagefactory/console.rb 2011-09-16 12:47:39.861755492 -0400
++++ rubygem-imagefactory-console-0.4.0/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/lib/imagefactory/console.rb 2011-09-16 12:51:04.824719734 -0400
+@@ -1,21 +1,16 @@
++# Copyright 2011 Red Hat, Inc.
+ #
+-# Copyright (C) 2011 Red Hat, Inc.
+-# Written by Jason Guiditta <jguiditt at redhat.com>
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
+ #
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; version 2 of the License.
++# http://www.apache.org/licenses/LICENSE-2.0
+ #
+-# 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 for more details.
+-#
+-# 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., 51 Franklin Street, Fifth Floor, Boston,
+-# MA 02110-1301, USA. A copy of the GNU General Public License is
+-# also available at http://www.gnu.org/copyleft/gpl.html.
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
+
+ # TODO: figure out what I am doing wrong here that I need this line
+ $: << File.expand_path(File.join(File.dirname(__FILE__), "."))
+@@ -248,4 +243,4 @@ class ImageFactoryConsole < Qmf2::Consol
+ def make_array(a)
+ return a ||= [a] unless a.instance_of?(Array)
+ end
+-end
+\ No newline at end of file
++end
+diff -Nurp rubygem-imagefactory-console-0.4.0.orig/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/lib/imagefactory.rb rubygem-imagefactory-console-0.4.0/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/lib/imagefactory.rb
+--- rubygem-imagefactory-console-0.4.0.orig/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/lib/imagefactory.rb 2011-09-16 12:47:39.861755492 -0400
++++ rubygem-imagefactory-console-0.4.0/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/lib/imagefactory.rb 2011-09-16 12:50:46.570927629 -0400
+@@ -1,2 +1,16 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ require 'imagefactory/console'
+ require 'imagefactory/base_handler'
+diff -Nurp rubygem-imagefactory-console-0.4.0.orig/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/Rakefile rubygem-imagefactory-console-0.4.0/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/Rakefile
+--- rubygem-imagefactory-console-0.4.0.orig/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/Rakefile 2011-09-16 12:47:39.861755492 -0400
++++ rubygem-imagefactory-console-0.4.0/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/Rakefile 2011-09-16 12:49:15.730895802 -0400
+@@ -1,22 +1,16 @@
++# Copyright 2011 Red Hat, Inc.
+ #
+-# Copyright (C) 2011 Red Hat, Inc.
+-# Written by Jason Guiditta <jguiditt at redhat.com>
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
+ #
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; version 2 of the License.
++# http://www.apache.org/licenses/LICENSE-2.0
+ #
+-# 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 for more details.
+-#
+-# 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., 51 Franklin Street, Fifth Floor, Boston,
+-# MA 02110-1301, USA. A copy of the GNU General Public License is
+-# also available at http://www.gnu.org/copyleft/gpl.html.
+-
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
+
+ require 'rubygems'
+ require 'rake'
+diff -Nurp rubygem-imagefactory-console-0.4.0.orig/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/spec/image_factory/console_spec.rb rubygem-imagefactory-console-0.4.0/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/spec/image_factory/console_spec.rb
+--- rubygem-imagefactory-console-0.4.0.orig/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/spec/image_factory/console_spec.rb 2011-09-16 12:47:39.862755316 -0400
++++ rubygem-imagefactory-console-0.4.0/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/spec/image_factory/console_spec.rb 2011-09-16 12:51:22.658585902 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ require 'spec_helper'
+
+ module ImageFactory
+diff -Nurp rubygem-imagefactory-console-0.4.0.orig/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/spec/spec_helper.rb rubygem-imagefactory-console-0.4.0/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/spec/spec_helper.rb
+--- rubygem-imagefactory-console-0.4.0.orig/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/spec/spec_helper.rb 2011-09-16 12:47:39.862755316 -0400
++++ rubygem-imagefactory-console-0.4.0/usr/lib/ruby/gems/1.8/gems/imagefactory-console-0.4.0/spec/spec_helper.rb 2011-09-16 12:51:17.394510895 -0400
+@@ -1,3 +1,17 @@
++# Copyright 2011 Red Hat, Inc.
++#
++# Licensed under the Apache License, Version 2.0 (the "License");
++# you may not use this file except in compliance with the License.
++# You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
+ $: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
+ require 'rubygems'
+ require 'imagefactory'
diff --git a/rubygem-imagefactory-console.spec b/rubygem-imagefactory-console.spec
index a634778..5e80643 100644
--- a/rubygem-imagefactory-console.spec
+++ b/rubygem-imagefactory-console.spec
@@ -10,11 +10,12 @@
Summary: QMF Console for Aeolus Image Factory
Name: rubygem-imagefactory-console
Version: 0.4.0
-Release: 5%{?dist}%{?extra_release}
+Release: 6%{?dist}%{?extra_release}
Group: Development/Languages
-License: GPLv2+ or Ruby
+License: ASL 2.0
URL: http://aeolusproject.org
Source0: http://repos.fedorapeople.org/repos/aeolus/imagefactory-console/0.4.0/gem/imagefactory-console-0.4.0.gem
+Patch1: fix-license.patch
Requires: rubygems
Requires: ruby(abi) = %{rubyabi}
# These can't be deduced by gem2rpm
@@ -32,22 +33,34 @@ QMF Console for Aeolus Image Factory
%prep
+%setup -q -c -T
+mkdir -p ./%{gemdir}
+gem install --local --install-dir ./%{gemdir} --force --rdoc %{SOURCE0}
+
+%patch1 -p1
%build
%install
+rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
- --force --rdoc %{SOURCE0}
+cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
%files
-%{gemdir}/gems/%{gemname}-%{version}/
+%doc %{geminstdir}/COPYING
+%dir %{geminstdir}
+%{geminstdir}/lib
+%{geminstdir}/spec
+%{geminstdir}/Rakefile
%doc %{gemdir}/doc/%{gemname}-%{version}
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%changelog
+* Fri Sep 16 2011 Chris Lalancette <clalance at redhat.com> - 0.4.0-6
+- Update license to ASL 2.0
+
* Thu Jul 21 2011 Mo Morsi <mmorsi at redhat.com> - 0.4.0-5
- new source0 instructions
More information about the scm-commits
mailing list