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
I'm assuming we want this fixed for 1.0
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
[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
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
[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
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