55c630 Update to latest git again, drop merged patches, update spec

Authored and Committed by adamwill 2 years ago
    Update to latest git again, drop merged patches, update spec
    
        
file modified
+87 -58