[vidalia/el6: 17/17] Merge branch 'master' into el6

[Jamie Nguyen]

commit 26c7aefb1e831b17636b1084aa72de1186c06258
Merge: f31b50d 589cb03
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Fri Nov 23 07:40:51 2012 +0000

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	vidalia.desktop
    	vidalia.spec

 .gitignore      |    4 ++-
 sources         |    2 +-
 vidalia.desktop |    6 ++--
 vidalia.spec    |   56 +++++++++++++++++++++++++++++++++++-------------------
 4 files changed, 43 insertions(+), 25 deletions(-)
---
diff --cc vidalia.desktop
index 9ea1afd,1b93654..3f56bd6
--- a/vidalia.desktop
+++ b/vidalia.desktop
@@@ -1,10 -1,9 +1,10 @@@
  [Desktop Entry]
 +Version=1.0
+ Type=Application
  Name=Vidalia
- GenericName=GUI controller for the Tor Onion Routing Network 
- GenericName[de]=Kontrolloberfläche für das Tor Onion Routing Netzwerk
+ GenericName=Tor GUI
+ Comment=GUI controller for the Tor Onion Routing Network 
  Exec=vidalia
  Terminal=false
- Type=Application
 -Categories=Network;Qt;
 +Categories=Network;KDE;Qt;Security;
  Icon=vidalia
diff --cc vidalia.spec
index 7355141,7905825..c44a1c1
--- a/vidalia.spec
+++ b/vidalia.spec
@@@ -4,11 -4,9 +4,10 @@@ Release:	1%{?dist
  Summary:	GUI controller for the Tor Onion Routing Network
  Group:		Applications/Internet
  License:	GPLv2+
 -URL:		http://www.torproject.org/vidalia/
 -Source0:	http://www.torproject.org/%{name}/dist/%{name}-%{version}.tar.gz
 +URL:		https://www.torproject.org/vidalia/
 +Source0:	https://www.torproject.org/%{name}/dist/%{name}-%{version}.tar.gz
  Source1:	%{name}.desktop
 +BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
- BuildRequires:	desktop-file-utils
  BuildRequires:	openssl-devel
  BuildRequires:	qt4-devel
  BuildRequires:	cmake