Date: Sunday, January 15, 2023 @ 20:47:49
  Author: andyrtr
Revision: 466646

Remove hardcoded python version strings

Modified:
  libreoffice-fresh/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-01-15 20:22:21 UTC (rev 466645)
+++ PKGBUILD    2023-01-15 20:47:49 UTC (rev 466646)
@@ -16,7 +16,7 @@
 arch=('x86_64')
 license=('LGPL3')
 url="https://www.libreoffice.org/";
-makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 
'libwps'
+makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps'
        'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
        'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 
        'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
@@ -289,7 +289,7 @@
 
 package_libreoffice-fresh() {
        pkgdesc="LibreOffice branch which contains new features and program 
enhancements"
-       depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 
'libwps'
+       depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 
'libwps'
                'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl'
                'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 
'graphite' 'icu' 
                'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 
'libcdr'
@@ -346,11 +346,13 @@
        install -m644 "${srcdir}"/libreoffice-fresh.{sh,csh} 
"${pkgdir}"/etc/profile.d/
 
        # make pyuno find its modules
-       install -dm755 "${pkgdir}"/usr/lib/python3.10/site-packages
+        local site_packages=$(python -c "import site; 
print(site.getsitepackages()[0])")
+
+       install -dm755 "${pkgdir}"/$site_packages
        ln -svf /usr/lib/libreoffice/program/uno.py \
-               "${pkgdir}"/usr/lib/python3.10/site-packages/uno.py
+               "${pkgdir}"/$site_packages/uno.py
        ln -svf /usr/lib/libreoffice/program/unohelper.py \
-               "${pkgdir}"/usr/lib/python3.10/site-packages/unohelper.py
+               "${pkgdir}"/$site_packages/unohelper.py
                
        # add a symlink required for gnome-documents; FS#51887
        # 
https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html

Reply via email to