I personally had a very serious water spot problem on my glass. I tried every glass cleaner I could get, even with Scotch Brite scrubbing pads. I even tried a rag soaked in straight white vinegar setting on the glass for several minutes. I then visited a local glass shop, and showed them the spots. The guy got a bottle, and said he'd try a spot and if it worked, I could buy the rest for $12.75. I agreed, and he got the spot perfectly clear. I bought the bottle of Duragloss Nu-Glass, went home, and used it on all my exterior glass. It removed ALL of the water spots. It is glass polish specifically designed for water spots. It's used just like any polish (apply, working it in, then buff off). Since taking up detailing, I've purchased a PC (Porter Cable 7336 dual action polisher). This really speeds up the process, so if you have access to a good dual action or random orbital polisher with pad, I'd recommend using it (if you use a rotary, use caution as they generate heat which can be bad for the glass).
You could do a search for Duragloss Nu Glass online and possibly find a supplier near you. I have only seen it online and at glass specialty shops (Auto Zone, Wal Mart, and the like don't normally carry it).
Hope this helps.
Dave