From 6bb81f9a9caa1c75fd9b68ae0b787ee925362141 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Tue, 7 Jun 2011 16:58:48 +0000 Subject: [PATCH] Explicitly set the rpm distro in the .spec so builds work from ubuntu boxes, and do a verbose mock --- cmake/Rpm.cmake | 2 +- dist/clementine.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Rpm.cmake b/cmake/Rpm.cmake index 269ac17cd..b0060a8b5 100644 --- a/cmake/Rpm.cmake +++ b/cmake/Rpm.cmake @@ -7,7 +7,7 @@ add_custom_target(rpm COMMAND ${CMAKE_SOURCE_DIR}/dist/maketarball.sh COMMAND ${CMAKE_COMMAND} -E copy clementine-${CLEMENTINE_VERSION_RPM}.tar.gz ${RPMBUILD_DIR}/SOURCES/ COMMAND rpmbuild -bs ${CMAKE_SOURCE_DIR}/dist/clementine.spec - COMMAND mock -r ${MOCK_CHROOT} ${RPMBUILD_DIR}/SRPMS/clementine-${CLEMENTINE_VERSION_RPM}-1.*.src.rpm + COMMAND mock -v -r ${MOCK_CHROOT} ${RPMBUILD_DIR}/SRPMS/clementine-${CLEMENTINE_VERSION_RPM}-1.*.src.rpm COMMAND ${CMAKE_COMMAND} -E copy /var/lib/mock/${MOCK_CHROOT}/result/clementine-${CLEMENTINE_VERSION_RPM}-1.${RPM_DISTRO}.${RPM_ARCH}.rpm ${CMAKE_BINARY_DIR}/clementine-${CLEMENTINE_VERSION_RPM}-1.${RPM_DISTRO}.${RPM_ARCH}.rpm ) diff --git a/dist/clementine.spec.in b/dist/clementine.spec.in index daa89aee5..ab0af297d 100644 --- a/dist/clementine.spec.in +++ b/dist/clementine.spec.in @@ -1,6 +1,6 @@ Name: clementine Version: @CLEMENTINE_VERSION_RPM@ -Release: 1%{?dist} +Release: 1.@RPM_DISTRO@ Summary: A music player and library organiser Group: Applications/Multimedia