Bug 810404

Summary:	Some GPL files that should be ASL
Product:	[Retired] CloudForms Cloud Engine	Reporter:	Jason Guiditta <jguiditt>
Component:	Distribution	Assignee:	Jason Guiditta <jguiditt>
Status:	CLOSED ERRATA	QA Contact:	wes hayutin <whayutin>
Severity:	high	Docs Contact:
Priority:	unspecified
Version:	1.0.0	CC:	akarol, cpelland, deltacloud-maint, morazi, ssachdev
Target Milestone:	rc
Target Release:	---
Hardware:	Unspecified
OS:	Unspecified
Whiteboard:
Fixed In Version:		Doc Type:	Bug Fix
Doc Text:		Story Points:	---
Clone Of:		Environment:
Last Closed:	2012-05-15 22:59:11 UTC	Type:	Bug
Regression:	---	Mount Type:	---
Documentation:	---	CRM:
Verified Versions:		Category:	---
oVirt Team:	---	RHEL 7.3 requirements from Atomic Host:
Cloudforms Team:	---	Target Upstream Version:
Embargoed:

Description Jason Guiditta 2012-04-05 21:48:20 UTC

Description of problem: Somehow when we switched to ASL, we missed (in conductor) the COPYING file and the 'License' lines in aeolus-conductor.spec.in

There are 2 refs there:

License:  GPLv2+ and MIT and BSD
License:   GPLv2+

Version-Release number of selected component (if applicable): latest in upstream and product

Comment 1 wes hayutin 2012-04-10 16:47:32 UTC

I'm assuming we want this fixed for 1.0

Comment 2 Jason Guiditta 2012-04-12 13:44:51 UTC

Pushed to master:

commit 86c916895685292494a100c55a3620d73dd576cf
Author: Jason Guiditta <jguiditt>
Date:   Wed Apr 11 14:45:25 2012 -0400

    BZ #810404: Some GPL files that should be ASL
    
    https://bugzilla.redhat.com/show_bug.cgi?id=810404

Comment 4 wes hayutin 2012-04-17 17:15:06 UTC

[whayutin@localhost conductor]$ git checkout -b localProduct origin/1.0-product
Branch localProduct set up to track remote branch 1.0-product from origin.
Switched to a new branch 'localProduct'
[whayutin@localhost conductor]$ git branch
  1.0-staging
* localProduct
[whayutin@localhost conductor]$ git show 86c916895685292494a100c55a3620d73dd576cf
fatal: bad object 86c916895685292494a100c55a3620d73dd576cf


upstream repo

[whayutin@localhost conductor]$ git show 86c916895685292494a100c55a3620d73dd576cf
commit 86c916895685292494a100c55a3620d73dd576cf
Author: Jason Guiditta <jguiditt>
Date:   Wed Apr 11 14:45:25 2012 -0400

    BZ #810404: Some GPL files that should be ASL
    
    https://bugzilla.redhat.com/show_bug.cgi?id=810404

diff --git a/COPYING b/COPYING
index d511905..1a9893b 100644
--- a/COPYING

Comment 5 Mike Orazi 2012-04-17 17:27:46 UTC

Changed get cherry-picked into the product branch currently, so the git hash is different.  I think this is what you are looking for:


commit 141d3998fc6db866053b832de7b8c2c399bfc903
Author: Jason Guiditta <jguiditt>
Date:   Wed Apr 11 14:45:25 2012 -0400

    BZ #810404: Some GPL files that should be ASL
    
    https://bugzilla.redhat.com/show_bug.cgi?id=810404

Comment 6 wes hayutin 2012-04-17 17:28:08 UTC

[whayutin@localhost conductor]$ git show 141d3998fc6db866053b832de7b8c2c399bfc903
commit 141d3998fc6db866053b832de7b8c2c399bfc903
Author: Jason Guiditta <jguiditt>
Date:   Wed Apr 11 14:45:25 2012 -0400

    BZ #810404: Some GPL files that should be ASL
    
    https://bugzilla.redhat.com/show_bug.cgi?id=810404

diff --git a/COPYING b/COPYING
index d511905..1a9893b 100644
--- a/COPYING
+++ b/COPYING
@@ -1,339 +1,176 @@
-                   GNU GENERAL PUBLIC LICENSE
-                      Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                           Preamble

Comment 8 errata-xmlrpc 2012-05-15 22:59:11 UTC

Since the problem described in this bug report should be
resolved in a recent advisory, it has been closed with a
resolution of ERRATA.

For information on the advisory, and where to find the updated
files, follow the link below.

If the solution does not work for you, open a new bug report.

http://rhn.redhat.com/errata/RHEA-2012-0583.html