4bf76fb Restore earlier structure of the spec file, also fixing previously

Authored and Committed by thm 6 years ago
    Restore earlier structure of the spec file, also fixing previously
      introduced problems.
    
        
file modified
+72 -21