Revert "Package cleanup and various fixes"
This reverts commit 397dff12633bb33d1f764a911da734989d33f602.
too much changes which are violating my personal coding style (tabs
vs. whitespace, curlies vs. non-curlies), breaking local things
(version watch) or builds on RHEL5 platforms (removal of %noarch).
Conflicts:
tor.spec