Bug 1077716

Summary: FlightCrew bundles zipios++
Product: [Fedora] Fedora Reporter: Ville Skyttä <ville.skytta>
Component: FlightCrewAssignee: Dan Horák <dan>
Status: CLOSED RAWHIDE QA Contact: Fedora Extras Quality Assurance <extras-qa>
Severity: unspecified Docs Contact:
Priority: unspecified    
Version: rawhideCC: dan, hdegoede
Target Milestone: ---   
Target Release: ---   
Hardware: Unspecified   
OS: Unspecified   
Whiteboard:
Fixed In Version: FlightCrew-0.7.2-10.fc21 Doc Type: Bug Fix
Doc Text:
Story Points: ---
Clone Of: Environment:
Last Closed: 2014-03-19 10:57:42 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:
Bug Depends On:    
Bug Blocks: 504493    
Attachments:
Description Flags
Diff between separate and FlightCrew zipios++
none
use system zipios - preliminary fix none

Description Ville Skyttä 2014-03-18 13:25:26 UTC 
https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries
https://fedoraproject.org/wiki/Packaging:Treatment_Of_Bundled_Libraries

FlightCrew appears to bundle zipios++ which is available as a separate package in Fedora. Looks like fixing this might take a bit of work but the situation doesn't seem as bad as src/zipios/changes_made.txt in the FlightCrew source tree suggests.
Comment 1 Dan Horák 2014-03-18 14:30:39 UTC 
We discussed it with Hans quite long time ago, so I don't remember the details, but IIRC the conclusion was to provide the forked zipios library from the flightgear package. What makes you think the situation is not that bad?
Comment 2 Ville Skyttä 2014-03-18 14:38:16 UTC 
Created attachment 875958 [details]
Diff between separate and FlightCrew zipios++

Because the diff between the FlightCrew version and the separately packaged one doesn't look that bad, certainly not "modified beyond recognition". See attachment.
Comment 3 Dan Horák 2014-03-18 15:55:02 UTC 
you missed, that FlightCrew adds zipextraction.{cpp,h}, in your diff, but otherwise it really sounds not so different ...
Comment 4 Ville Skyttä 2014-03-18 16:17:53 UTC 
(In reply to Dan Horák from comment #3)
> you missed, that FlightCrew adds zipextraction.{cpp,h}, in your diff,

I actually didn't, the .cpp is elsewhere in the source tree so it naturally didn't get included in the diff, and the .h is there:

$ curl -s "https://bugzilla.redhat.com/attachment.cgi?id=875958" | grep zipe
Only in zipios++-flightcrew: zipextraction.h

Anyway they're complete additions, so I don't think they should count as differences per se and can continue to be included.
Comment 5 Dan Horák 2014-03-18 16:30:24 UTC 
Created attachment 876026 [details]
use system zipios - preliminary fix

3 subtle changes are required (see top of the diff), the rest is just removal

hmm, how could we miss it ... :-) thanks Ville
Comment 6 Ville Skyttä 2014-03-18 17:13:08 UTC 
(In reply to Dan Horák from comment #5)
> 3 subtle changes are required (see top of the diff), the rest is just removal

Would be more concise to do the removals with rm in the spec instead of in a giant patch... and I'll shut up now :)
Comment 7 Dan Horák 2014-03-18 17:21:03 UTC 
(In reply to Ville Skyttä from comment #6)
> (In reply to Dan Horák from comment #5)
> > 3 subtle changes are required (see top of the diff), the rest is just removal
> 
> Would be more concise to do the removals with rm in the spec instead of in a
> giant patch... and I'll shut up now :)

yes, that's the plan :-) I just wanted to record the work in progress so it's not lost. Now I'm thinking how to integrate it properly into upstream code to allow builds with/without system zipios.