Mini floor pump + elaborate patch kit. Carrying a spare tube was in practice pointless for me. I ride differently sized wheels on different bikes. I can remember to take along my tire repair set, but remembering to swap the tube for another size has been beyond me - I usually ended up with the wrong size taken along.