From dbb3ac45d948e0d18521cbde4e033b28dc7b380a Mon Sep 17 00:00:00 2001
From: Julian <julian@cccv.de>
Date: Fri, 25 Mar 2022 00:43:09 +0100
Subject: [PATCH] Fix PHP version constraints and libxml2 dependency
Closes #2
---
scripts/appstore.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/appstore.py b/scripts/appstore.py
index ac8a32a..d136f87 100755
--- a/scripts/appstore.py
+++ b/scripts/appstore.py
@@ -62,9 +62,9 @@ def get_debian_packages_for_php_extension(name, minver=None, maxver=None):
# libxml is builtin, but some apps have version requirements for the underlying libxml2
res = []
if minver is not None:
- res.append(f'libxml (>= {minver})')
+ res.append(f'libxml2 (>= {minver})')
if maxver is not None:
- res.append(f'libxml (<< {maxver})')
+ res.append(f'libxml2 (<< {maxver})')
return res
if name in {'calendar', 'ctype', 'exif', 'ffi', 'fileinfo', 'ftp',
'gettext', 'iconv', 'pdo', 'phar', 'posix', 'shmop', 'sockets',
@@ -107,8 +107,10 @@ def create_debian_dir(app):
dependencies.append(f'nextcloud')
minver, maxver = parse_version_spec(release['phpVersionSpec'])
if minver is not None:
+ minver = re.sub(r'\.[0-9]+$', '', minver) # package version only has two digits
dependencies.append(f'php (>= 2:{minver})')
if maxver is not None:
+ maxver = re.sub(r'\.[0-9]+$', '', maxver) # package version only has two digits
dependencies.append(f'php (<< 2:{maxver})')
if minver is None and maxver is None:
dependencies.append(f'php')
--
GitLab