diff options
| -rw-r--r-- | libre/parabolaweb-utils/PKGBUILD | 10 | ||||
| -rw-r--r-- | pcr/nginx-passenger/PKGBUILD | 4 | ||||
| -rw-r--r-- | pcr/pandoc/PKGBUILD | 19 | ||||
| -rw-r--r-- | pcr/pandoc/SRCBUILD | 8 |
4 files changed, 20 insertions, 21 deletions
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD index cd81c83de..25cfeb421 100644 --- a/libre/parabolaweb-utils/PKGBUILD +++ b/libre/parabolaweb-utils/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> pkgname=(parabolaweb-utils parabolaweb-dev) -pkgver=20140117 -pkgdesc="Utilities for managing the parabolaweb website application" +pkgver=20140616 +pkgdesc="Utilities for managing the ParabolaWeb website application" url="https://projects.parabolagnulinux.org/packages/parabolaweb-utils.git/" license=('GPL2') @@ -10,7 +10,7 @@ license=('GPL2') # Bump pkgrel instead of pkgver if updating this is the only change _parabolaweb_commit=724f8c309c97aa9af7f963687342e8f37e682204 -pkgrel=2 +pkgrel=1 epoch=1 arch=('any') @@ -18,7 +18,7 @@ source=( "https://projects.parabolagnulinux.org/packages/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" "requirements_prod-${_parabolaweb_commit}.txt::https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt?id=${_parabolaweb_commit}" ) -md5sums=('4543e360c0f5ecbfa3a4a51b2bd9131d' +md5sums=('a3a5c128161a2560368281700bd2c4f7' '8bf17af4e66f552864bfdc0fd1d472f1') build() { @@ -35,6 +35,6 @@ package_parabolaweb-utils() { package_parabolaweb-dev() { cd "$srcdir/$pkgbase-$pkgver" - pkgdesc="Depends on packages needed to develop parabolaweb" + pkgdesc="Depends on packages needed to develop ParabolaWeb" depends=($(sed -r -e 's/\s*#.*//' depends_make.txt)) } diff --git a/pcr/nginx-passenger/PKGBUILD b/pcr/nginx-passenger/PKGBUILD index b2c47b0df..f2bfcf0c9 100644 --- a/pcr/nginx-passenger/PKGBUILD +++ b/pcr/nginx-passenger/PKGBUILD @@ -8,7 +8,7 @@ pkgname=nginx-passenger _nginxver=1.6.0 -_passengerver=4.0.41 +_passengerver=4.0.45 pkgver=$_nginxver.passenger.$_passengerver pkgrel=1 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' @@ -37,7 +37,7 @@ source=($url/download/nginx-$_nginxver.tar.gz service logrotate) md5sums=('8efa354f1c3c2ccf434a50d3fbe82340' - 'ce2b669c498457cf385d250eea43b055' + 'ce85ed506a084112eaa015a3642007d9' 'ce9a06bcaf66ec4a3c4eb59b636e0dfd' '3441ce77cdd1aab6f0ab7e212698a8a7') diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD index 668c6407b..89e35b17d 100644 --- a/pcr/pandoc/PKGBUILD +++ b/pcr/pandoc/PKGBUILD @@ -3,10 +3,14 @@ # Run `makepkg -sp SRCBUILD` if you want to update the source tarball +# hslua fails if LANG is empty or C +test -z "$LANG" && export LANG="en_US.utf8" + pkgname=pandoc-static _pkgname=pandoc -pkgver=1.12.3.3 -pkgrel=2 +pkgver=1.12.4.2 +pkgrel=1 +_srcrel=2 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') @@ -15,7 +19,7 @@ arch=('i686' 'x86_64') depends=('icu>=52' 'icu<=54') makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy') options=(strip !makeflags !distcc !emptydirs) -source=(https://repo.parabolagnulinux.org/other/pandoc-static/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig} +source=(https://repo.parabolagnulinux.org/other/pandoc-static/${_pkgname}-${pkgver}-${_srcrel}-any.src.tar.xz{,.sig} SRCBUILD) replaces=('pandoc') provides=('pandoc') @@ -88,7 +92,8 @@ package() { # EC is unfree and makes Parabola TeXLive cry # besides, it's unneeded - sed "/fontenc/d" -i ${pkgdir}/usr/share/${_pkgname}-${pkgver}/data/templates/default.latex + find "${pkgdir}/usr/share" -name default.latex -exec \ + sed "/fontenc/d" -i {} \; find ${pkgdir}/usr/share -type f -exec chmod 644 {} \; find ${pkgdir}/usr/share -type d -exec chmod 755 {} \; @@ -97,9 +102,3 @@ package() { install -d ${pkgdir}/usr/share/licenses cp -rv ${srcdir}/build/usr/share/doc/* ${pkgdir}/usr/share/licenses/ } -sha1sums=('4984149bad15e5b07594d130b4f9d2dad4286e67' - 'SKIP' - '734e0b61b5a1f1ebf42b77c0b52ef18cd899f461') -sha256sums=('7d469701d3bc033dce2e12fca8460f0d17fdb980a65dd25f266ee8f6071f5830' - 'SKIP' - 'a4370706e79992e570334584f647121096ed9b439f4531bfd11da247acff782e') diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD index 618e4e220..9cc4b128e 100644 --- a/pcr/pandoc/SRCBUILD +++ b/pcr/pandoc/SRCBUILD @@ -2,8 +2,8 @@ # Based on haskell-pandoc pkgname=pandoc -pkgver=1.12.3.3 -pkgrel=1 +pkgver=1.12.4.2 +pkgrel=2 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') @@ -21,12 +21,12 @@ build() { cabal --verbose=3 update HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal --verbose=3 fetch hs-bibutils network hexpat text-0.11.3.1 text-icu hsb2hs ${pkgname}-${pkgver} pandoc-citeproc + cabal --verbose=3 fetch hs-bibutils network hexpat text text-icu hsb2hs ${pkgname}-${pkgver} pandoc-citeproc msg2 "Getting the dependency build order" # Ignore the cabal messages HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --flags="embed_data_files bibutils hexpat unicode_collation" --dry-run text-0.11.3.1 hsb2hs ${pkgname}-${pkgver} pandoc-citeproc | + cabal install --flags="embed_data_files bibutils hexpat unicode_collation" --dry-run text hsb2hs ${pkgname}-${pkgver} pandoc-citeproc | grep "\-[0-9]\+" | tee BUILDORDER } |