merge fix in flux.spec