diff options
| -rwxr-xr-x | xraylarch/PKGBUILD | 11 | ||||
| -rw-r--r-- | xraylarch/fix-root.patch | 28 |
2 files changed, 3 insertions, 36 deletions
diff --git a/xraylarch/PKGBUILD b/xraylarch/PKGBUILD index d5b6a667..f78e2d65 100755 --- a/xraylarch/PKGBUILD +++ b/xraylarch/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Erich Eckner <arch at eckner dot net> pkgname=xraylarch -pkgver=0.9.39 +pkgver=0.9.40 pkgrel=1 pkgdesc="Data Analysis Tools for X-ray Spectroscopy" arch=('i686' 'x86_64') @@ -53,17 +53,12 @@ backup=() options=() source=( "${pkgname}-${pkgver}.tar.gz::https://github.com/xraypy/${pkgname}/archive/${pkgver}.tar.gz" - 'fix-root.patch' -) -sha512sums=( - 'fb766930df572117005b50f142936cd43dd687e5e22588d5c9ba4d30f36f0bd5ea65bb4096ba4feb46bac921ecb2f3e0b93377dd7fa851b256d979a56f2739d4' - '377a449d9839b2c47266b661939183701189b7a3f85edb14626e80c7fb24a8584b9668917fe0a24bf80a505f69850e36cef0c439fca44bdea8ecfb9acaa7be6e' ) +sha512sums=('a37db5b2c2ad81d9731195156220fa7ff9be57b178cc17f5d0565f9cef2b2c3bd84cfa9791dd6aaee5535780c3e51ef7ec0d9f06d487a026aa6814ce2ac9dea5') prepare() { - cd "${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/fix-root.patch" + sed -i 's/pjoin(install_prefix, scriptdir)/install_prefix + scriptdir/' "${pkgname}-${pkgver}/setup.py" } diff --git a/xraylarch/fix-root.patch b/xraylarch/fix-root.patch deleted file mode 100644 index 11f35b33..00000000 --- a/xraylarch/fix-root.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/setup.py 2018-07-10 16:33:03.044849216 +0200 -+++ b/setup.py 2018-07-10 16:32:51.198144418 +0200 -@@ -197,7 +197,7 @@ - requirements = f.readlines() - - # now we have all the data files, so we can run setup --setup(name = 'xraylarch', -+dist = setup(name = 'xraylarch', - version = __version__, - author = 'Matthew Newville and the X-rayLarch Development Team', - author_email = 'newville@cars.uchicago.edu', -@@ -215,6 +215,7 @@ - 'Programming Language :: Python', - 'Topic :: Scientific/Engineering'], - ) -+icmd = dist.get_command_obj('install') - - - def remove_cruft(basedir, filelist): -@@ -307,7 +308,7 @@ - scriptdir = pjoin(sys.exec_prefix, bindir) - for src in scripts: - _, fname = psplit(src) -- dest = pjoin(scriptdir, fname) -+ dest = pjoin(icmd.root + scriptdir, fname) - shutil.copy(src, dest) - os.chmod(dest, 493) # mode=755 - |