* Now puts correct version into src/version.h.

* Version of Arch Linux Package is the same as version of WWWOFFLE itself (including +svn<revision>), i.e. same format.

2 files changed, 39 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index faa1bc63040d..a2c26e9a97fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
 # Generated by mksrcinfo v8
-# Sat Mar  5 21:18:36 UTC 2016
+# Mon Mar 21 11:12:23 UTC 2016
 pkgbase = wwwoffle-svn
 	pkgdesc = Simple caching proxy server with special features (request, recursive fetch, abonnement, modify HTML, ...) for use with dial-up internet links. Includes startup scripts for OpenRC, System V init, systemd.
-	pkgver = 2.9j.r2220
-	pkgrel = 5
+	pkgver = 2.9i+svn2221
+	pkgrel = 1
+	epoch = 1
 	url = http://www.gedanken.org.uk/software/wwwoffle/
 	install = wwwoffle.install
 	arch = i686
@@ -14,18 +15,18 @@ pkgbase = wwwoffle-svn
 	depends = zlib
 	depends = gnutls
 	depends = libgcrypt
-	provides = wwwoffle=2.9j.r2220
-	provides = wwwoffle-sysvinit=2.9j.r2220
-	provides = wwwoffle-openrc=2.9j.r2220
-	provides = wwwoffle-systemd=2.9j.r2220
+	provides = wwwoffle=2.9i+svn2221
+	provides = wwwoffle-sysvinit=2.9i+svn2221
+	provides = wwwoffle-openrc=2.9i+svn2221
+	provides = wwwoffle-systemd=2.9i+svn2221
 	conflicts = wwwoffle
 	conflicts = wwwoffle-sysvinit
 	conflicts = wwwoffle-openrc
 	conflicts = wwwoffle-systemd
-	replaces = wwwoffle<=2.9j.r2220
-	replaces = wwwoffle-sysvinit<=2.9j.r2220
-	replaces = wwwoffle-openrc<=2.9j.r2220
-	replaces = wwwoffle-systemd<=2.9j.r2220
+	replaces = wwwoffle<=2.9i+svn2221
+	replaces = wwwoffle-sysvinit<=2.9i+svn2221
+	replaces = wwwoffle-openrc<=2.9i+svn2221
+	replaces = wwwoffle-systemd<=2.9i+svn2221
 	backup = etc/wwwoffle/wwwoffle.conf
 	backup = etc/wwwoffle/wwwoffle.conf.template
 	source = wwwoffle::svn+http://gedanken.org.uk/svn/wwwoffle/trunk
diff --git a/PKGBUILD b/PKGBUILD
index c0d23bb24e6c..0c496f823492 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,9 @@
 _pkgname=wwwoffle
 pkgname="${_pkgname}-svn"
 # _pkgver=2.9i
-pkgver=2.9j.r2220
-pkgrel=5
+epoch=1
+pkgver=2.9i+svn2221
+pkgrel=1
 pkgdesc="Simple caching proxy server with special features (request, recursive fetch, abonnement, modify HTML, ...) for use with dial-up internet links. Includes startup scripts for OpenRC, System V init, systemd."
 arch=('i686' 'x86_64' 'arm' 'arm64')
 url="http://www.gedanken.org.uk/software/wwwoffle/"
@@ -63,12 +64,23 @@ sha256sums=(
 
 _pgmver() {
   _unpackeddir="${srcdir}/${_pkgname}"
+  
+  # # Well, this _is_ useless use of cat, but to make it more clear to see in which order things are going on I do the cat first and then the grep.
+  # _ver="$(cat "${_unpackeddir}/conf/wwwoffle.conf.template" | \
+  #           grep -E '^#.*WWWOFFLE.*[Vv]ersion' | \
+  #           head -n 1 | \
+  #           sed 's|.* \([^ ]*\)$|\1|g' | \
+  #           sed 's|\.$||g'
+  #        )"
+  
   # Well, this _is_ useless use of cat, but to make it more clear to see in which order things are going on I do the cat first and then the grep.
-  _ver="$(cat "${_unpackeddir}/conf/wwwoffle.conf.template" | \
-            grep -E '^#.*WWWOFFLE.*[Vv]ersion' | \
-            head -n 1 | \
-            sed 's|.* \([^ ]*\)$|\1|g' | \
-            sed 's|\.$||g')"
+  _ver="$(cat "${_unpackeddir}/src/version.h" | \
+            grep -E '^[[:space:]]*#define[[:space:]]+WWWOFFLE_VERSION' | \
+            awk '{print $3}' | \
+            tr -d \'\" | \
+            awk -F+ '{print $1}'
+        )"
+
   
   echo "${_ver}"
   
@@ -90,7 +102,7 @@ _svnrelease() {
 
 pkgver() {
   _unpackeddir="${srcdir}/${_pkgname}"
-  # Format: RELEASE.rREVISION, e.g. 2.9j.r2202
+  
   _ver="$(_pgmver)"
   _rev="$(_svnrelease)"
   
@@ -108,7 +120,7 @@ pkgver() {
     return 1
   fi
   
-  echo "${_ver}.r${_rev}"
+  echo "${_ver}+svn${_rev}"
 }
 
 prepare() {
@@ -118,18 +130,18 @@ prepare() {
     msg "Applying patch '${_patch}' ..."
     patch -p1 < "${_patch}" || exit "$?"
   done
-}
-
-build() {
-  _unpackeddir="${srcdir}/${_pkgname}"
-  cd "${_unpackeddir}"
   
   ### Update version.h to the actual version.
   _ver="$(_pgmver)"
   _rev="$(_svnrelease)"
   msg "Updating version in src/version.h to ${_ver}+svn${_rev}..."
   sed -i 's|^\([[:space:]]*#define[[:space:]]*WWWOFFLE_VERSION[[:space:]]*\).*$|/*+ +*/\n/*+ The following line was automatically upgraded by the Arch Linux PKGBUILD (package build script) +*/\n/*+ in order to match the version as in conf/wwwoffle.conf.template and the SVN revision. +*/\n\1"'"${_ver}+svn${_rev}"'"|' \
-    'src/version.h'
+    "${_unpackeddir}/src/version.h"
+}
+
+build() {
+  _unpackeddir="${srcdir}/${_pkgname}"
+  cd "${_unpackeddir}"
   
   ### Make the ./configure-script.
   # libtoolize --force