[vidalia] * Sat Jan 07 2012 Paul Wouters <paul at xelerance.com> - 0.2.15-1 - Updated to 0.2.15 - Don't use --del

[Paul Wouters]

commit fded45a8f81a25fcd0fb3aed7e5b0a5abe64cda5
Author: Paul Wouters <paul at xelerance.com>
Date:   Sat Jan 7 12:31:51 2012 +0100

    * Sat Jan 07 2012 Paul Wouters <paul at 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

 .gitignore   |    1 +
 sources      |    2 +-
 vidalia.spec |   10 ++++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ea6fbe5..a1ec942 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /vidalia-0.2.12.tar.gz
+/vidalia-0.2.15.tar.gz
diff --git a/sources b/sources
index 47d7107..61f658c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f1e108af87676980ff821c36ce8d87e2  vidalia-0.2.12.tar.gz
+845b627eb2534aa5da29efd6c8d30978  vidalia-0.2.15.tar.gz
diff --git a/vidalia.spec b/vidalia.spec
index 783b0d3..9472ecb 100644
--- a/vidalia.spec
+++ b/vidalia.spec
@@ -1,5 +1,5 @@
 Name:		vidalia
-Version:	0.2.12
+Version:	0.2.15
 Release:	1%{?dist}
 Summary:	GUI controller for the Tor Onion Routing Network
 Group:		Applications/Internet
@@ -15,6 +15,7 @@ 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 
@@ -40,7 +41,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 install -Dpm0644 doc/%{name}.1 \
 	%{buildroot}%{_mandir}/man1/%{name}.1
 
-desktop-file-install --delete-original \
+desktop-file-install \
 	--dir %{buildroot}%{_datadir}/applications \
 	%{SOURCE1}
 
@@ -74,6 +75,11 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %changelog
+* Sat Jan 07 2012 Paul Wouters <paul at 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 at 163.com> - 0.2.12-1
 - New upstream release