From 230aa62b2e5459bc3f4a6acc6cbb22e87670fcba Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 16 Apr 2021 13:08:37 +0200 Subject: [PATCH] python-oslo-config: drop install scripts --- mingw-w64-python-oslo-config/PKGBUILD | 10 +++------- .../oslo-config3-i686.install | 17 ----------------- .../oslo-config3-x86_64.install | 17 ----------------- 3 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 mingw-w64-python-oslo-config/oslo-config3-i686.install delete mode 100644 mingw-w64-python-oslo-config/oslo-config3-x86_64.install diff --git a/mingw-w64-python-oslo-config/PKGBUILD b/mingw-w64-python-oslo-config/PKGBUILD index 8b570253da..db61b6c2d5 100644 --- a/mingw-w64-python-oslo-config/PKGBUILD +++ b/mingw-w64-python-oslo-config/PKGBUILD @@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=8.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="parsing command line arguments and .ini style configuration files (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64') @@ -27,7 +27,6 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-oslotest" "${MINGW_PACKAGE_PREFIX}-python-testrepository" "${MINGW_PACKAGE_PREFIX}-python-oslo-log") options=('staticlibs' 'strip' '!debug') -install=${_realname}3-${CARCH}.install source=("${_realname}-${pkgver}.tar.gz::https://github.com/openstack/oslo.config/archive/${pkgver}.tar.gz") sha512sums=('67ffdf44097da4ffc92323609bd9ae967029ee46498f7b656018aaa876b05d3e7cd24e9c7e1116cc0ce2aaa10125cc5ae8a652b579261d2842b19032bae3c782') @@ -58,10 +57,7 @@ package() { install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE" - local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) - # fix python command in files - for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do - sed -e "s|/usr/bin/env |${MINGW_PREFIX}|g" \ - -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f} + for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*-script.py; do + sed -e '1 { s/^#!.*$// }' -i ${_f} done } diff --git a/mingw-w64-python-oslo-config/oslo-config3-i686.install b/mingw-w64-python-oslo-config/oslo-config3-i686.install deleted file mode 100644 index a936a27130..0000000000 --- a/mingw-w64-python-oslo-config/oslo-config3-i686.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - cd mingw32 - local _prefix=$(pwd -W) - cd - - local _it -# "somepackage" should be replaced with the name of your .EXE w/o 2 and .exe ext -# Like this: -# For "myexe.exe", it would be "myexe" . - for _it in oslo-config-generator; do - sed -e "s|/mingw32|${_prefix}|g" \ - -i ${_prefix}/bin/${_it}-script.py - done -} - -post_upgrade() { - post_install -} diff --git a/mingw-w64-python-oslo-config/oslo-config3-x86_64.install b/mingw-w64-python-oslo-config/oslo-config3-x86_64.install deleted file mode 100644 index 3f1d8bab81..0000000000 --- a/mingw-w64-python-oslo-config/oslo-config3-x86_64.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - cd mingw64 - local _prefix=$(pwd -W) - cd - - local _it -# "somepackage" should be replaced with the name of your .EXE w/o 2 and .exe ext -# Like this: -# For "myexe.exe", it would be "myexe" . - for _it in oslo-config-generator; do - sed -e "s|/mingw64|${_prefix}|g" \ - -i ${_prefix}/bin/${_it}-script.py - done -} - -post_upgrade() { - post_install -}