[vidalia] Update to 0.2.10

[Chen Lei]

commit 3bd51960e2932e88e67c7da4ca5191216aaa74ce
Author: Chen Lei <supercyper at 163.com>
Date:   Sat Sep 18 12:37:55 2010 +0800

    Update to 0.2.10

 .gitignore   |    2 +-
 sources      |    2 +-
 vidalia.spec |   54 +++++++++++++-----------------------------------------
 3 files changed, 15 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7a3a4f0..73591bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-vidalia-0.2.9.tar.gz
+/vidalia-0.2.10.tar.gz
diff --git a/sources b/sources
index 510145d..3acdef7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ce038ba6c3b511a4788bc3926b3390e  vidalia-0.2.9.tar.gz
+ae5a46cc362e2db54f8751ccc9becaba  vidalia-0.2.10.tar.gz
diff --git a/vidalia.spec b/vidalia.spec
index 119e626..e7c8139 100644
--- a/vidalia.spec
+++ b/vidalia.spec
@@ -1,17 +1,17 @@
 Name:		vidalia
-Version:	0.2.9
+Version:	0.2.10
 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
+URL:		http://www.torproject.org/vidalia/
+Source0:	http://www.torproject.org/%{name}/dist/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 BuildRequires:	openssl-devel
 BuildRequires:	qt4-devel
 BuildRequires:	cmake
 BuildRequires:	desktop-file-utils
-Requires:	tor%{?_isa}
+Requires:	tor
 Requires:	hicolor-icon-theme
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 Obsoletes:	%{name}-doc < 0.2.8-1
@@ -26,18 +26,16 @@ if you wish.
 %prep
 %setup -q
 
-
 %build
-export PATH=%{_qt4_bindir}:$PATH
-# fix DSOLinking
-sed -i '/torcontrol/a \ \ z' src/vidalia/CMakeLists.txt
-%cmake .
-
-make %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} ..
+popd
 
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
-make install INSTALL="install -p" DESTDIR=%{buildroot}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 install -Dpm0644 doc/%{name}.1 \
 	%{buildroot}%{_mandir}/man1/%{name}.1
@@ -66,7 +64,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %clean
 rm -rf %{buildroot}
 
-
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG CREDITS LICENSE* README
@@ -77,6 +74,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %changelog
+* Fri Sep 17 2010 Chen Lei <supercyper at 163.com> - 0.2.10-1
+- New upstream release
+
 * Wed May 26 2010 Chen Lei <supercyper at 163.com> - 0.2.9-1
 - New upstream release
 
@@ -98,31 +98,3 @@ rm -rf %{buildroot}
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Jul 07 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.14-1
-- New upstream release
-
-* Mon Jun 01 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.13-2
-- Merge builds for fedora and epel
-
-* Mon Jun 01 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.13-1
-- Update to 0.1.13
-- Adjust to fedora and epel
-
-* Sun Apr 06 2009 Simon Wesp <cassmodiah at 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 at 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 at fedoraproject.org> - 0.1.10-1
-- Initial Package build