From 1a0bc756296945cde7df9064944bbc186a820d5c Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 22 Feb 2019 22:57:53 +0100 Subject: [PATCH] Change pacman to use current git revision --- cmake/Version.cmake | 4 ++-- dist/pacman/PKGBUILD.in | 21 ++++++++------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 4f501ff90..059e5a666 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -84,8 +84,8 @@ if(GIT_REVISION) set(STRAWBERRY_VERSION_PACKAGE "${GIT_TAGNAME}.${GIT_COMMITCOUNT}.${GIT_SHA1}") set(STRAWBERRY_VERSION_RPM_V "${GIT_TAGNAME}") set(STRAWBERRY_VERSION_RPM_R "2.${GIT_COMMITCOUNT}.${GIT_SHA1}") - set(STRAWBERRY_VERSION_PAC_V "${GIT_TAGNAME}") - set(STRAWBERRY_VERSION_PAC_R "${GIT_COMMITCOUNT}") + set(STRAWBERRY_VERSION_PAC_V "${GIT_TAGNAME}.r${GIT_COMMITCOUNT}.${GIT_SHA1}") + set(STRAWBERRY_VERSION_PAC_R "1") endif() diff --git a/dist/pacman/PKGBUILD.in b/dist/pacman/PKGBUILD.in index 62bffe216..79e99c96a 100644 --- a/dist/pacman/PKGBUILD.in +++ b/dist/pacman/PKGBUILD.in @@ -40,30 +40,25 @@ optdepends=( ) provides=(strawberry) conflicts=(strawberry) -source=("git+https://github.com/jonaski/strawberry.git") +source=("strawberry-@STRAWBERRY_VERSION_PACKAGE@.tar.xz") sha256sums=('SKIP') -pkgver() { - cd "strawberry" - git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' -} - prepare() { - cd "${srcdir}/strawberry" - install -d strawberry-build + mkdir -p build } build() { - cd "${srcdir}/strawberry/strawberry-build" - cmake .. \ + cd build + cmake ../$pkgname-@STRAWBERRY_VERSION_PACKAGE@ \ -DCMAKE_INSTALL_PREFIX=/usr \ -DUSE_SYSTEM_TAGLIB=ON \ -DENABLE_STREAM_DEEZER=ON \ - -DENABLE_PHONON=ON - make + -DENABLE_PHONON=ON \ + -DENABLE_TRANSLATIONS=ON + make -j$(nproc) } package() { - cd "${srcdir}/strawberry/strawberry-build" + cd build make DESTDIR="${pkgdir}" install }