From ec8416443f68a7873b3ba295acaea364dacd805c Mon Sep 17 00:00:00 2001
From: David Sansome <me@davidsansome.com>
Date: Fri, 2 Dec 2011 19:06:53 +0000
Subject: [PATCH] Use the sparkle version for the tarball and source directory,
 tell the rpm spec to use that instead of the default

---
 cmake/Rpm.cmake         | 2 +-
 dist/clementine.spec.in | 4 ++--
 dist/maketarball.sh.in  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/Rpm.cmake b/cmake/Rpm.cmake
index 06233f946..44e50bd6e 100644
--- a/cmake/Rpm.cmake
+++ b/cmake/Rpm.cmake
@@ -6,7 +6,7 @@ set(RPM_ARCH x86_64 CACHE STRING "Architecture of the rpm file")
 
 add_custom_target(rpm
   COMMAND ${CMAKE_SOURCE_DIR}/dist/maketarball.sh
-  COMMAND ${CMAKE_COMMAND} -E copy clementine-${CLEMENTINE_VERSION_DEB}.tar.gz ${RPMBUILD_DIR}/SOURCES/
+  COMMAND ${CMAKE_COMMAND} -E copy clementine-${CLEMENTINE_VERSION_SPARKLE}.tar.gz ${RPMBUILD_DIR}/SOURCES/
   COMMAND rpmbuild -bs ${CMAKE_SOURCE_DIR}/dist/clementine.spec
   COMMAND ${MOCK_COMMAND}
       --verbose
diff --git a/dist/clementine.spec.in b/dist/clementine.spec.in
index ad129b8e5..f9ed876cf 100644
--- a/dist/clementine.spec.in
+++ b/dist/clementine.spec.in
@@ -6,7 +6,7 @@ Summary:        A music player and library organiser
 Group:          Applications/Multimedia
 License:        GPLv3
 URL:            http://www.clementine-player.org/
-Source0:        %{name}-@CLEMENTINE_VERSION_DEB@.tar.gz
+Source0:        %{name}-@CLEMENTINE_VERSION_SPARKLE@.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils liblastfm-devel taglib-devel gettext
@@ -55,7 +55,7 @@ Features include:
   * Queue manager
 
 %prep
-%setup -q
+%setup -q -n %{name}-@CLEMENTINE_VERSION_SPARKLE@
 
 
 %build
diff --git a/dist/maketarball.sh.in b/dist/maketarball.sh.in
index 5af5aaa59..0059363ef 100755
--- a/dist/maketarball.sh.in
+++ b/dist/maketarball.sh.in
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 name=clementine
-version="@CLEMENTINE_VERSION_DEB@"
+version="@CLEMENTINE_VERSION_SPARKLE@"
 deb_dist="@DEB_DIST@"
 root=$(cd "${0%/*}/.." && echo $PWD/${0##*/})
 root=`dirname "$root"`