upgpkg: weewx 5.0.0-2

- Fix missing "world-readable" permission
- Split out docs package

3 files changed, 61 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3489abf89ebe..9ae8fe57d78a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,26 @@
 pkgbase = weewx
 	pkgdesc = Software for logging data from weather stations
 	pkgver = 5.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.weewx.com/
 	arch = any
 	license = GPL-3.0-or-later
 	makedepends = mkdocs
 	makedepends = mkdocs-material
 	makedepends = mkdocs-material-extensions
+	makedepends = python
+	makedepends = python-cheetah3
+	makedepends = python-configobj
+	source = weewx-5.0.0.tar.xz::https://github.com/weewx/weewx/archive/refs/tags/v5.0.0.tar.gz
+	source = weewx.sysusers
+	source = weewx.tmpfiles
+	source = weewx.service
+	sha512sums = c3eb23048012f2bab7eac0a25f6dfad4da4ff1591601f7242cf7fec91343e88f3014b7281c021c75cfdbb5b4e73285ab8605325a3c7771e90a5016e3d574dc3b
+	sha512sums = 6015b870143f6b8ae094b3f94ad53323be8a083f11c177dc508315fb3bbc20dd318124e6ccd41ba9d0388828e18c4b4ae6ce7c4a35ac0cab442eca9e8bbbca2d
+	sha512sums = e97b287acf53c55d30f4e1a4d533fe5c649fac44080095fa1052f6f1cc9a55b6b0592d63c63a4a241e7007894e882648d5c4c4a221da69666e284637c5a3e15e
+	sha512sums = 4744fec4faf63b36f9c82a7404e4ecc749eb07e8d90640465ff7a2ae20cdb2560348b0a125467fad215d0e51d88d27a991dc0196899e53d19479dec942d6e52d
+
+pkgname = weewx
 	depends = python
 	depends = python-cheetah3
 	depends = python-configobj
@@ -17,13 +30,6 @@ pkgbase = weewx
 	optdepends = python-pyephem: extended celestial information
 	optdepends = python-pymysql: MySQL or MariaDB support
 	backup = etc/weewx/weewx.conf
-	source = weewx-5.0.0.tar.xz::https://github.com/weewx/weewx/archive/refs/tags/v5.0.0.tar.gz
-	source = weewx.sysusers
-	source = weewx.tmpfiles
-	source = weewx.service
-	sha512sums = c3eb23048012f2bab7eac0a25f6dfad4da4ff1591601f7242cf7fec91343e88f3014b7281c021c75cfdbb5b4e73285ab8605325a3c7771e90a5016e3d574dc3b
-	sha512sums = 6015b870143f6b8ae094b3f94ad53323be8a083f11c177dc508315fb3bbc20dd318124e6ccd41ba9d0388828e18c4b4ae6ce7c4a35ac0cab442eca9e8bbbca2d
-	sha512sums = 9875bf209439f62fc2e6773b1283a6ed0a2adbe33e7b6461678a5f036679570a98393814eeadcb20b9d9160b79aca0b1a1769eab39be2d1913b64439abd76f62
-	sha512sums = 4744fec4faf63b36f9c82a7404e4ecc749eb07e8d90640465ff7a2ae20cdb2560348b0a125467fad215d0e51d88d27a991dc0196899e53d19479dec942d6e52d
 
-pkgname = weewx
+pkgname = weewx-docs
+	pkgdesc = Documentation for WeeWX
diff --git a/PKGBUILD b/PKGBUILD
index d3489dec6e19..94eef24348f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,8 @@
 
 # Supports automatic update checking
 
-pkgname=weewx
+pkgbase=weewx
+pkgname=("weewx" "weewx-docs")
 _MAJOR=5
 _MINOR=0
 _PATCH=0
@@ -13,40 +14,34 @@ function _dl_url {
   echo "https://github.com/weewx/weewx/archive/refs/tags/v$1.$2.$3.tar.gz"
 }
 
-pkgrel=1
+pkgrel=2
 pkgdesc="Software for logging data from weather stations"
 arch=("any")
 url="http://www.weewx.com/"
 license=("GPL-3.0-or-later")
-depends=("python"
-         "python-cheetah3"
-         "python-configobj"
-         "python-pillow")
-optdepends=("python-pyserial: serial port support"
-            "python-pyusb: USB port support"
-            "python-pyephem: extended celestial information"
-            "python-pymysql: MySQL or MariaDB support")
 makedepends=("mkdocs"
              "mkdocs-material"
-             "mkdocs-material-extensions")
-backup=("etc/weewx/weewx.conf")
-source=("$pkgname-$pkgver.tar.xz::$(_dl_url $_MAJOR $_MINOR $_PATCH)"
+             "mkdocs-material-extensions"
+             "python"
+             "python-cheetah3"
+             "python-configobj")
+source=("$pkgbase-$pkgver.tar.xz::$(_dl_url $_MAJOR $_MINOR $_PATCH)"
         "weewx.sysusers"
         "weewx.tmpfiles"
         "weewx.service")
 sha512sums=('c3eb23048012f2bab7eac0a25f6dfad4da4ff1591601f7242cf7fec91343e88f3014b7281c021c75cfdbb5b4e73285ab8605325a3c7771e90a5016e3d574dc3b'
             '6015b870143f6b8ae094b3f94ad53323be8a083f11c177dc508315fb3bbc20dd318124e6ccd41ba9d0388828e18c4b4ae6ce7c4a35ac0cab442eca9e8bbbca2d'
-            '9875bf209439f62fc2e6773b1283a6ed0a2adbe33e7b6461678a5f036679570a98393814eeadcb20b9d9160b79aca0b1a1769eab39be2d1913b64439abd76f62'
+            'e97b287acf53c55d30f4e1a4d533fe5c649fac44080095fa1052f6f1cc9a55b6b0592d63c63a4a241e7007894e882648d5c4c4a221da69666e284637c5a3e15e'
             '4744fec4faf63b36f9c82a7404e4ecc749eb07e8d90640465ff7a2ae20cdb2560348b0a125467fad215d0e51d88d27a991dc0196899e53d19479dec942d6e52d')
 _watch="http://www.weewx.com/downloads/"
 
 build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
+  cd "$srcdir/${pkgbase}-${pkgver}"
 
   echo "Compiling Python bytecode"
   python -m compileall -q "src"
 
-  echo "Building documentation"
+  echo "Compiling documentation"
   make --quiet build-docs
 }
 
@@ -63,8 +58,18 @@ _install() {
   find "$dest" -type d -exec chmod a+x {} +
 }
 
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
+package_weewx() {
+  depends=("python"
+           "python-cheetah3"
+           "python-configobj"
+           "python-pillow")
+  optdepends=("python-pyserial: serial port support"
+              "python-pyusb: USB port support"
+              "python-pyephem: extended celestial information"
+              "python-pymysql: MySQL or MariaDB support")
+  backup=("etc/weewx/weewx.conf")
+
+  cd "$srcdir/${pkgbase}-${pkgver}"
 
   local PYTHON='python'
   local weewx_bindir='/usr/lib/weewx'
@@ -77,7 +82,6 @@ package() {
   local libdir="${pkgdir}${weewx_bindir}"
   local sharedir="${pkgdir}${weewx_sharedir}"
   local licensedir="$pkgdir/usr/share/licenses/weewx"
-  local docdir="$pkgdir/usr/share/doc/weewx"
   local etcdir="${pkgdir}${weewx_etcdir}"
   local unitdir="$pkgdir/usr/lib/systemd/system"
   local sysusersdir="$pkgdir/usr/lib/sysusers.d"
@@ -104,10 +108,6 @@ package() {
   install -Dm644 "docs_src/copyright.md" "$licensedir/copyright.md"
   install -Dm644 "LICENSE.txt" "$licensedir/LICENSE.txt"
 
-  echo "Copying documentation"
-  [[ -d "$docdir" ]] || mkdir -p "$docdir"
-  _install "$docdir" 644 "build/docs"/*
-
   echo "Copying skins"
   [[ -d "$sharedir" ]] || mkdir -p "$sharedir"
   _install "$sharedir" 644 "src/weewx_data/skins"
@@ -127,17 +127,29 @@ package() {
     -e "s%HTML_ROOT = public_html%HTML_ROOT = $weewx_vardir/www%" \
     -e "s%SQLITE_ROOT = .*%SQLITE_ROOT = $weewx_vardir%" \
     "src/weewx_data/weewx.conf" > "$etcdir/weewx.conf"
-  chmod 640 "$etcdir/weewx.conf"
+  chmod 644 "$etcdir/weewx.conf"
 
- echo "Creating systemd unit"
- install -Dm640 "$srcdir/weewx.service" "$unitdir/weewx.service"
+  echo "Creating systemd unit"
+  install -Dm644 "$srcdir/weewx.service" "$unitdir/weewx.service"
 
- echo "Creating system user definition"
- install -Dm640 "$srcdir/weewx.sysusers" "$sysusersdir/weewx.conf"
+  echo "Creating system user definition"
+  install -Dm644 "$srcdir/weewx.sysusers" "$sysusersdir/weewx.conf"
 
- echo "Creating tmpfiles definition"
- install -Dm640 "$srcdir/weewx.tmpfiles" "$tmpfilesdir/weewx.conf"
+  echo "Creating tmpfiles definition"
+  install -Dm644 "$srcdir/weewx.tmpfiles" "$tmpfilesdir/weewx.conf"
+
+  echo "Creating udev ruleset"
+  install -Dm644 "src/weewx_data/util/udev/rules.d/weewx.rules" "$udevdir/weewx.rules"
+}
 
- echo "Creating udev ruleset"
- install -Dm640 "src/weewx_data/util/udev/rules.d/weewx.rules" "$udevdir/weewx.rules"
+package_weewx-docs() {
+  pkgdesc="Documentation for WeeWX"
+
+  cd "$srcdir/${pkgbase}-${pkgver}"
+
+  local docdir="$pkgdir/usr/share/doc/weewx"
+
+  echo "Copying documentation"
+  [[ -d "$docdir" ]] || mkdir -p "$docdir"
+  _install "$docdir" 644 "build/docs"/*
 }
diff --git a/weewx.tmpfiles b/weewx.tmpfiles
index 14a5a35660a0..841230ebece6 100755
--- a/weewx.tmpfiles
+++ b/weewx.tmpfiles
@@ -1,4 +1,4 @@
 # WeeWX directory permissions
 #Type Path               Mode User  Group Age Argument…
-d     /var/lib/weewx     750  weewx weewx -
+d     /var/lib/weewx     755  weewx weewx -
 d     /var/lib/weewx/www 755  weewx weewx -