summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLev Levitsky2018-04-05 17:31:43 +0300
committerLev Levitsky2018-04-05 17:31:43 +0300
commite2b2bcbad54023e839392b18c536962affb1848b (patch)
tree8877a2a3c141086b2532d26e02e5b6580028e7c3
parent7b5b0ee62323bb4f1b535295e6381f289c77369f (diff)
downloadaur-e2b2bcbad54023e839392b18c536962affb1848b.tar.gz
Remove stupid patch file
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD11
-rw-r--r--cmake_install.patch11
3 files changed, 7 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1ba4e7e9c15e..222b5ca919fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = crux-toolkit-git
pkgdesc = The Crux mass spectrometry analysis toolkit
- pkgver = r3143.b196a791
+ pkgver = r3149.4438655b
pkgrel = 1
url = http://crux.ms/
arch = x86_64
@@ -8,12 +8,11 @@ pkgbase = crux-toolkit-git
makedepends = git
makedepends = subversion
makedepends = cmake
+ makedepends = sed
depends = gcc-libs
provides = crux-toolkit
conflicts = crux-toolkit-bin
source = git+https://github.com/crux-toolkit/crux-toolkit
- source = cmake_install.patch
- md5sums = SKIP
md5sums = SKIP
pkgname = crux-toolkit-git
diff --git a/PKGBUILD b/PKGBUILD
index 8a255360e770..05e8bf81c9e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,17 @@
# Maintainer: Lev Levitsky <levlev at mail.ru>
pkgname=crux-toolkit-git
-pkgver=r3143.b196a791
+pkgver=r3149.4438655b
pkgrel=1
pkgdesc="The Crux mass spectrometry analysis toolkit"
arch=('x86_64')
url="http://crux.ms/"
license=('Apache')
depends=('gcc-libs')
-makedepends=('git' 'subversion' 'cmake')
+makedepends=('git' 'subversion' 'cmake' 'sed')
provides=("${pkgname%-git}")
conflicts=("${pkgname%-git}-bin")
-source=('git+https://github.com/crux-toolkit/crux-toolkit'
- 'cmake_install.patch')
-md5sums=('SKIP' 'SKIP')
+source=('git+https://github.com/crux-toolkit/crux-toolkit')
+md5sums=('SKIP')
pkgver() {
cd "$srcdir/${pkgname%-git}"
@@ -23,7 +22,7 @@ pkgver() {
build() {
cd "$srcdir/${pkgname%-git}"
cmake -DCMAKE_INSTALL_PREFIX:PATH="${pkgdir}/usr" -DCMAKE_VERBOSE_MAKEFILE=OFF .
- patch -i ../../cmake_install.patch cmake_install.cmake
+ sed -i 's|^[[:space:]]*include(.*doc/user|#&|' cmake_install.cmake
make
}
diff --git a/cmake_install.patch b/cmake_install.patch
deleted file mode 100644
index ccd38dced060..000000000000
--- a/cmake_install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake_install.cmake 2018-03-17 01:36:55.466349861 +0300
-+++ cmake_install.cmake 2018-03-17 01:41:06.188106516 +0300
-@@ -43,7 +43,7 @@
-
- if(NOT CMAKE_INSTALL_LOCAL_ONLY)
- # Include the install script for each subdirectory.
-- include("/home/lev/aur4/crux-toolkit-git/src/crux-toolkit/doc/user/cmake_install.cmake")
-+# include("/home/lev/aur4/crux-toolkit-git/src/crux-toolkit/doc/user/cmake_install.cmake")
- include("/home/lev/aur4/crux-toolkit-git/src/crux-toolkit/ext/cmake_install.cmake")
- include("/home/lev/aur4/crux-toolkit-git/src/crux-toolkit/src/cmake_install.cmake")
- include("/home/lev/aur4/crux-toolkit-git/src/crux-toolkit/test/smoke-tests/cmake_install.cmake")