summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Gathoye2017-01-08 18:48:20 +0100
committerWilliam Gathoye2017-01-08 18:48:20 +0100
commit407f319db17727c372b4587af5f02dd92e7b37f3 (patch)
tree101a61ba634faf80849581a5bed7119e9a1d76ff
parent51499f491637166344893d1bbbd90195848074a2 (diff)
downloadaur-407f319db17727c372b4587af5f02dd92e7b37f3.tar.gz
Change description, use build function, precise license, prepare package for non git version
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD20
2 files changed, 19 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ed6a914b7cb..7de91fed412 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
pkgbase = progit2-git
- pkgdesc = A package to build the latest version of the progit2 book and read it when offline
+ pkgdesc = The offline version of the entire Pro Git book, written by Scott Chacon and Ben Straub
pkgver = 2.0.0.r689.g5026c45
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/progit/progit2
install = progit2-git.install
arch = any
- license = CCPL
+ license = CCPL:by-nc-sa
makedepends = git
makedepends = ruby-bundler
makedepends = ruby
makedepends = python2
+ provides = progit2
+ conflicts = progit2
source = git+https://github.com/progit/progit2
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 21319f90491..28351067c2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
pkgname=progit2-git
pkgver=2.0.0.r689.g5026c45
-pkgrel=1
-pkgdesc="A package to build the latest version of the progit2 book and read it when offline"
+pkgrel=2
+pkgdesc="The offline version of the entire Pro Git book, written by Scott Chacon and Ben Straub"
arch=('any')
url="https://github.com/progit/progit2"
-license=('CCPL')
+license=('CCPL:by-nc-sa')
makedepends=(
'git'
@@ -16,6 +16,8 @@ makedepends=(
'ruby'
'python2'
)
+provides=('progit2')
+conflicts=('progit2')
install=${pkgname}.install
@@ -29,7 +31,7 @@ pkgver() {
}
prepare() {
- cd "$srcdir/${pkgname%-git}"
+ cd "${pkgname%-git}"
# Gem dependencies can be installed per user and not systemwide in
# /home/<your username>/.gem/ruby/<ruby version>/, but we won't be able to
@@ -57,12 +59,18 @@ prepare() {
bundle install
}
-package() {
+build() {
# When entering here, we are in the src directory, go in the cloned progit2
# directory.
- cd "$srcdir/${pkgname%-git}"
+ cd "${pkgname%-git}"
bundle exec rake book:build
+}
+
+package() {
+ # When entering here, we are in the src directory, go in the cloned progit2
+ # directory.
+ cd "${pkgname%-git}"
# Install to /usr/share/doc/progit2
install -dm755 "$pkgdir/usr/share/doc/${pkgname%-git}/"