Use the sparkle version for the tarball and source directory, tell the rpm spec to use that instead of the default

This commit is contained in:
David Sansome 2011-12-02 19:06:53 +00:00
parent 08d7d0ce8c
commit ec8416443f
3 changed files with 4 additions and 4 deletions

View File

@ -6,7 +6,7 @@ set(RPM_ARCH x86_64 CACHE STRING "Architecture of the rpm file")
add_custom_target(rpm add_custom_target(rpm
COMMAND ${CMAKE_SOURCE_DIR}/dist/maketarball.sh 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 rpmbuild -bs ${CMAKE_SOURCE_DIR}/dist/clementine.spec
COMMAND ${MOCK_COMMAND} COMMAND ${MOCK_COMMAND}
--verbose --verbose

View File

@ -6,7 +6,7 @@ Summary: A music player and library organiser
Group: Applications/Multimedia Group: Applications/Multimedia
License: GPLv3 License: GPLv3
URL: http://www.clementine-player.org/ 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils liblastfm-devel taglib-devel gettext BuildRequires: desktop-file-utils liblastfm-devel taglib-devel gettext
@ -55,7 +55,7 @@ Features include:
* Queue manager * Queue manager
%prep %prep
%setup -q %setup -q -n %{name}-@CLEMENTINE_VERSION_SPARKLE@
%build %build

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
name=clementine name=clementine
version="@CLEMENTINE_VERSION_DEB@" version="@CLEMENTINE_VERSION_SPARKLE@"
deb_dist="@DEB_DIST@" deb_dist="@DEB_DIST@"
root=$(cd "${0%/*}/.." && echo $PWD/${0##*/}) root=$(cd "${0%/*}/.." && echo $PWD/${0##*/})
root=`dirname "$root"` root=`dirname "$root"`