[arch-commits] Commit in nginx/trunk (PKGBUILD nginx.install)

[Sébastien Luttringer]

    Date: Wednesday, August 28, 2013 @ 20:00:39
  Author: seblu
Revision: 96429

upgpkg: nginx 1.5.4-1

- upstream upgrade
- split non-upstream plugin into nginx-extra

Modified:
  nginx/trunk/PKGBUILD
  nginx/trunk/nginx.install

---------------+
 PKGBUILD      |    9 +++++----
 nginx.install |   25 ++++++++++++++++---------
 2 files changed, 21 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-28 17:05:42 UTC (rev 96428)
+++ PKGBUILD	2013-08-28 18:00:39 UTC (rev 96429)
@@ -6,13 +6,12 @@
 
 pkgbase=nginx
 pkgname=(nginx nginx-extra)
-pkgver=1.4.2
-pkgrel=1.2
+pkgver=1.5.4
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('pcre' 'zlib' 'openssl' 'gd' 'geoip' 'passenger')
 url='http://nginx.org'
 license=('custom')
-install=nginx.install
 backup=('etc/nginx/fastcgi.conf'
         'etc/nginx/fastcgi_params'
         'etc/nginx/koi-win'
@@ -27,7 +26,7 @@
         'http://web.iti.upv.es/~sto/nginx/ngx_http_auth_pam_module-1.2.tar.gz'
         'service'
         'logrotate')
-sha256sums=('5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611'
+sha256sums=('ad21d7ee5146d5c571917574b8a8bbab658faff6ffbff7cab2e69a3afadd65dc'
             '5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9'
             '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b'
             '272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98')
@@ -91,6 +90,7 @@
     pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
     conflicts=('nginx-extra')
     depends=('pcre' 'zlib' 'openssl')
+    install=$pkgname.install
 
     cd $pkgname-$pkgver
     make DESTDIR="$pkgdir" install
@@ -121,6 +121,7 @@
 
     pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server with extra modules'
     conflicts=('nginx')
+    provides=("nginx=$pkgver")
     depends=('pcre' 'zlib' 'openssl' 'gd' 'geoip')
 }
 

Modified: nginx.install
===================================================================
--- nginx.install	2013-08-28 17:05:42 UTC (rev 96428)
+++ nginx.install	2013-08-28 18:00:39 UTC (rev 96429)
@@ -1,15 +1,22 @@
 post_upgrade() {
-    if [[ $(vercmp $2 1.2.7-4) -le 0 ]]; then
+    if (( $(vercmp $2 1.2.7-4) <= 0 )); then
         chmod 750 var/log/nginx
         chown http:log var/log/nginx
     fi
-    if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then
-        echo " >>> Since 1.2.1-2 several changes has been made in package:"
-        echo "      - *.conf files have been moved to /etc/nginx"
-        echo "      - /etc/conf.d/nginx has been removed"
-        echo "        Main configuration file is set to /etc/nginx/nginx.conf"
-        echo "      - access.log and error.log can be found in /var/log/nginx by default" 
-        echo "      - bundled *.html files have been moved to /usr/share/nginx/html"
-        echo "      - /etc/nginx/{html,logs} symbolic links and *.default files have been removed"
+    if (( $(vercmp $2 1.2.1-2) <= 0 )); then
+        echo ' >>> Since 1.2.1-2 several changes has been made in package:'
+        echo '      - *.conf files have been moved to /etc/nginx'
+        echo '      - /etc/conf.d/nginx has been removed'
+        echo '        Main configuration file is set to /etc/nginx/nginx.conf'
+        echo '      - access.log and error.log can be found in /var/log/nginx by default'
+        echo '      - bundled *.html files have been moved to /usr/share/nginx/html'
+        echo '      - /etc/nginx/{html,logs} symbolic links and *.default files have been removed'
     fi
+    if (( $(vercmp $2 1.5.4-1) < 0 )); then
+        echo 'nginx have been splited into 2 packages: nginx and nginx-extra.'
+        echo 'nginx include only upstream bundled modules'
+        echo 'nginx-extra currently include passenger and auth-pam'
+    fi
 }
+
+# vim:set ts=4 sw=4 et: