aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Quinn2015-08-14 19:38:34 -0400
committerJoseph Quinn2015-08-15 17:12:05 -0400
commit9833f2a133f67053bec4d42b054b9c214c2228c7 (patch)
treed336202525acd04e0c8390ee43b7c17601452a1c
parent40419219f2e3addfd04072018ddf2d73d316b5c9 (diff)
downloadaur-9833f2a133f67053bec4d42b054b9c214c2228c7.tar.gz
fixed srcinfo
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD19
-rw-r--r--locations.ini4
3 files changed, 15 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3974c0023b41..012447fc30cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
pkgbase = nginx-passenger-git
pkgdesc = A fast and robust web server and application server for Ruby, Python, and Node.js
- pkgver = 5.0.14.r5.gbf537aa
+ pkgver = 5.0.15.r12.g4595e9a
pkgrel = 1
url = https://www.phusionpassenger.com
+ install = nginx-passenger-git.install
arch = i686
arch = x86_64
license = custom
@@ -40,7 +41,7 @@ pkgbase = nginx-passenger-git
sha256sums = SKIP
sha256sums = 0a8359248a1dd1e98a96b036a636095af0c2fe770d661ab7dd988b3999d08b9f
sha256sums = d85edb44894468d2e471d38176b6827635fb0c1251ce55765f4aa59c1bcb1791
- sha256sums = 6a99bd6544cadd0563b549a5fb24d0aed98fe51f5dcdaacbfa2f9b8026360d1e
+ sha256sums = 10ba5a23200b73c9c80d7617c857f98667ddbb3f7bf195dc7d0830689f509454
pkgname = nginx-passenger-git
diff --git a/PKGBUILD b/PKGBUILD
index 23d0e027abcc..93c9cf8d586b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
_nginxver=1.8.0
pkgname=nginx-passenger-git
-pkgver=5.0.15.r3.g4ae1c74
+pkgver=5.0.15.r12.g4595e9a
pkgrel=1
pkgdesc='A fast and robust web server and application server for Ruby, Python, and Node.js'
arch=('i686' 'x86_64')
url='https://www.phusionpassenger.com'
-license=('custom' 'custom')
+license=('custom')
depends=('openssl' 'pcre' 'zlib' 'geoip' 'ruby')
makedepends=('hardening-wrapper' 'git')
optdepends=('nodejs: Support for nodejs web apps'
@@ -40,7 +40,7 @@ sha256sums=('23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5'
'SKIP'
'0a8359248a1dd1e98a96b036a636095af0c2fe770d661ab7dd988b3999d08b9f'
'd85edb44894468d2e471d38176b6827635fb0c1251ce55765f4aa59c1bcb1791'
- '6a99bd6544cadd0563b549a5fb24d0aed98fe51f5dcdaacbfa2f9b8026360d1e')
+ '10ba5a23200b73c9c80d7617c857f98667ddbb3f7bf195dc7d0830689f509454')
pkgver() {
cd "$srcdir/passenger"
@@ -138,8 +138,8 @@ package() {
install -Dm755 buildout/support-binaries/PassengerAgent \
"$pkgdir"/usr/lib/passenger/support-binaries/PassengerAgent
- install -d "$pkgdir"/usr/share/passenger/helper-scripts
- mv helper-scripts/* "$pkgdir"/usr/share/passenger/helper-scripts/
+ install -d "$pkgdir"/usr/share/passenger
+ mv helper-scripts/ "$pkgdir"/usr/share/passenger/
install -d "$pkgdir"/usr/lib/ruby/vendor_ruby
mv lib/* "$pkgdir"/usr/lib/ruby/vendor_ruby/
@@ -149,14 +149,15 @@ package() {
install -d "$pkgdir"/usr/share/passenger/ruby_extension_source
mv ext/ruby/* "$pkgdir"/usr/share/passenger/ruby_extension_source/
- install -d "$pkgdir"/usr/share/passenger/node
- mv node_lib/* "$pkgdir"/usr/share/passenger/node/
+ install -d "$pkgdir"/usr/share/passenger/ngx_http_passenger_module
+ mv ext/nginx/* "$pkgdir"/usr/share/passenger/ngx_http_passenger_module/
+
+ mv node_lib/ "$pkgdir"/usr/share/passenger/
install -d "$pkgdir"/usr/share/doc/passenger
mv doc/* "$pkgdir"/usr/share/doc/passenger/
- install -d "$pkgdir"/usr/share/passenger/templates
- mv resources/templates/* "$pkgdir"/usr/share/passenger/templates/
+ mv resources/templates/ "$pkgdir"/usr/share/passenger/
install -d "$pkgdir"/usr/share/man/man1/
gzip -9c "$srcdir"/passenger/man/passenger-config.1 > "$pkgdir"/usr/share/man/man1/passenger-config.1.gz
diff --git a/locations.ini b/locations.ini
index 830ae886c527..6108216c45e0 100644
--- a/locations.ini
+++ b/locations.ini
@@ -9,7 +9,7 @@ resources_dir=/usr/share/passenger
include_dir=/usr/share/passenger/include
doc_dir=/usr/share/doc/passenger
ruby_libdir=/usr/lib/ruby/vendor_ruby
-node_libdir=/usr/share/passenger/node
-apache2_module_path=/usr/lib/httpd/modules/mod_passenger.so
+node_libdir=/usr/share/passenger/node_lib
ruby_extension_source_dir=/usr/share/passenger/ruby_extension_source
nginx_module_source_dir=/usr/share/passenger/ngx_http_passenger_module
+apache2_module_path=/usr/lib/httpd/modules/mod_passenger.so \ No newline at end of file