h2o2.2 package

2 files changed, 17 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f236e3c2b59b..abca4fd44618 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = h2o
+pkgbase = h2o-2.2
 	pkgdesc = Optimized HTTP server with support for HTTP/1.x and HTTP/2
-	pkgver = 2.3.0_beta2
+	pkgver = 2.2.6
 	pkgrel = 1
 	url = https://github.com/h2o/h2o
 	arch = i686
@@ -20,10 +20,12 @@ pkgbase = h2o
 	provides = h2o
 	provides = libh2o
 	conflicts = libh2o
+	conflicts = h2o
+	conflicts = h2o-git
 	backup = etc/h2o.conf
-	source = h2o-2.3.0_beta2.tar.gz::https://codeload.github.com/h2o/h2o/tar.gz/v2.3.0-beta2
+	source = h2o-2.2.6.tar.gz::https://codeload.github.com/h2o/h2o/tar.gz/v2.2.6
 	source = h2o.service
-	sha512sums = b30330482f8dee98d990c34c2c91145ca864d52773ae5e42ebc30390fe07d47d043135c773b11deeb4dbcd13882184f86eac17dd2f4b75a92e9d63955d54fec0
+	sha512sums = f2f28905c01782a0432c9dfdb2f21054e0a4741ac4c5f26802d4b439d0172840aa215aba5dc7c9af62275dcc24de105674a3819384dc38246e43ce3e8263eb20
 	sha512sums = c7e797ccf38aaec017e02c11549ff42dc384555b8a4a19e864d50ba1148110dab426b47326771481dc04cd2a1b65d7916c6cfff771fb0e6555887765703a0b9c
 
-pkgname = h2o
+pkgname = h2o-2.2
diff --git a/PKGBUILD b/PKGBUILD
index b6873b431d8b..3b3196a718f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,9 @@
 
 # FIXME: mruby disabled until we figure out how to build with it
 
-pkgname=h2o
-pkgver=2.3.0_beta2
+pkgname=h2o-2.2
+_pkgname=h2o
+pkgver=2.2.6
 pkgrel=1
 pkgdesc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 arch=('i686' 'x86_64')
@@ -11,16 +12,16 @@ depends=('libuv' 'libyaml' 'wslay' 'zlib')
 makedepends=('gcc' 'bison' 'cmake' 'libtool' 'make' 'pkg-config' 'ruby')
 url="https://github.com/h2o/h2o"
 license=('MIT')
-source=($pkgname-$pkgver.tar.gz::https://codeload.github.com/h2o/$pkgname/tar.gz/v${pkgver/_/-}
+source=($_pkgname-$pkgver.tar.gz::https://codeload.github.com/h2o/$_pkgname/tar.gz/v${pkgver/_/-}
         h2o.service)
-sha512sums=('b30330482f8dee98d990c34c2c91145ca864d52773ae5e42ebc30390fe07d47d043135c773b11deeb4dbcd13882184f86eac17dd2f4b75a92e9d63955d54fec0'
+sha512sums=('f2f28905c01782a0432c9dfdb2f21054e0a4741ac4c5f26802d4b439d0172840aa215aba5dc7c9af62275dcc24de105674a3819384dc38246e43ce3e8263eb20'
 	    'c7e797ccf38aaec017e02c11549ff42dc384555b8a4a19e864d50ba1148110dab426b47326771481dc04cd2a1b65d7916c6cfff771fb0e6555887765703a0b9c')
 backup=('etc/h2o.conf')
 provides=('h2o' 'libh2o')
-conflicts=('libh2o')
+conflicts=('libh2o' 'h2o' 'h2o-git')
 
 build() {
-  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  cd "$srcdir/$_pkgname-${pkgver/_/-}"
 
   msg2 'Building...'
   cmake \
@@ -34,13 +35,13 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  cd "$srcdir/$_pkgname-${pkgver/_/-}"
 
   msg2 'Installing license...'
-  install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
 
   msg2 'Installing documentation...'
-  install -Dm 644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
+  install -Dm 644 README.md "$pkgdir/usr/share/doc/$_pkgname/README.md"
 
   msg2 'Installing systemd service...'
   install -Dm 644 "$srcdir/h2o.service" "$pkgdir/usr/lib/systemd/system/h2o.service"