Merge branch 'master' into el6

Conflicts:
	.gitignore
	sources
	vidalia.desktop
	vidalia.spec

.gitignore

@@ -0,0 +1,3 @@
+/vidalia-0.2.12.tar.gz
+/vidalia-0.2.15.tar.gz
+/vidalia-0.2.20.tar.gz

dead.package

@@ -1 +0,0 @@
-Upstream recommend against using this software anymore.

sources

@@ -0,0 +1 @@
+f40a3a1c43f4a1f16322969c0cb6f5bf  vidalia-0.2.20.tar.gz

vidalia.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Vidalia
+GenericName=Tor GUI
+Comment=GUI controller for the Tor Onion Routing Network 
+Exec=vidalia
+Terminal=false
+Categories=Network;KDE;Qt;Security;
+Icon=vidalia

vidalia.spec

@@ -0,0 +1,151 @@
+Name:		vidalia
+Version:	0.2.20
+Release:	1%{?dist}
+Summary:	GUI controller for the Tor Onion Routing Network
+Group:		Applications/Internet
+License:	GPLv2+
+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:	openssl-devel
+BuildRequires:	qt4-devel
+BuildRequires:	cmake
+BuildRequires:	desktop-file-utils
+Requires:	tor
+Requires:	hicolor-icon-theme
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+Obsoletes:	%{name}-doc < 0.2.8-1
+Provides:	%{name}-doc = 0.2.8-1
+
+%description
+Vidalia is a cross-platform controller GUI for Tor, built using the Qt 
+framework. Vidalia allows you to start and stop Tor, view the status of 
+Tor at a glance, and monitor Tor's bandwidth usage. Vidalia also makes 
+it easy to contribute to the Tor network by helping you setup a Tor server,
+if you wish.
+
+%prep
+%setup -q
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
+%install
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
+install -Dpm0644 doc/%{name}.1 \
+	%{buildroot}%{_mandir}/man1/%{name}.1
+
+desktop-file-install --vendor="" \
+	--dir %{buildroot}%{_datadir}/applications \
+	%{SOURCE1}
+
+chmod -x contrib/*
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ] ; then
+	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc CHANGELOG CREDITS LICENSE* README
+%doc contrib
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}*
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+
+%changelog
+* Thu Nov 15 2012 Paul Wouters <pwouters@redhat.com> - 0.2.20-1
+- Updated to 0.2.20
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 07 2012 Paul Wouters <paul@xelerance.com> - 0.2.15-1
+- Updated to 0.2.15
+- Don't use --delete-original in desktop-file-install
+- Fix obsolete-not-provided vidalia-doc
+
+* Sun May 22 2011 Chen Lei <supercyper@163.com> - 0.2.12-1
+- New upstream release
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Sep 29 2010 jkeating - 0.2.10-2
+- Rebuilt for gcc bug 634757
+
+* Fri Sep 17 2010 Chen Lei <supercyper@163.com> - 0.2.10-1
+- New upstream release
+
+* Wed May 26 2010 Chen Lei <supercyper@163.com> - 0.2.9-1
+- New upstream release
+
+* Wed Apr 21 2010 Chen Lei <supercyper@163.com> - 0.2.8-1
+- New upstream release
+- Remove -doc subpackage
+
+* Sun Jan 31 2010 Chen Lei <supercyper@163.com> - 0.2.7-2
+- Add contrib to -doc subpackage
+
+* Sun Jan 31 2010 Chen Lei <supercyper@163.com> - 0.2.7-1
+- New upstream release
+
+* Wed Sep 02 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.15-1
+- New upstream release
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 0.1.14-3
+- rebuilt with new openssl
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 07 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.1.14-1
+- New upstream release
+
+* Mon Jun 01 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.1.13-2
+- Merge builds for fedora and epel
+
+* Mon Jun 01 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.1.13-1
+- Update to 0.1.13
+- Adjust to fedora and epel
+
+* Sun Apr 06 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.1.12-1
+- New upstream release
+- Correct typo in URL
+- Add R: hicolor for new handling of icons
+- Add update-icon-cache sniplet
+- Use summary of upstream for Desktopfile and in spec file
+- Create doxygen-documentations
+
+* Sun Feb 15 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.1.10-2
+- Correct Qt in Summary
+- Correct Qt in desktop-file-source
+- Add a german Translation in the desktop-file-source
+- Using CMAKE-macro instead of cmake
+- Add more files to more documentation
+
+* Tue Feb 10 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.1.10-1
+- Initial Package build