diff options
author | Michel Zou | 2024-02-12 21:30:02 +0100 |
---|---|---|
committer | Michel Zou | 2024-02-12 21:30:02 +0100 |
commit | 5815e3f20314738bc5158f8b83125891146f634e (patch) | |
tree | a9ea5674eb2858dfbb4d86ffc48faf46c76f18e0 | |
parent | f34941e58f7aa35b2c14f3a5ea7f7370033949a8 (diff) | |
download | aur-5815e3f20314738bc5158f8b83125891146f634e.tar.gz |
fix conflict
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 7 |
2 files changed, 5 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = omniorbpy pkgdesc = A CORBA object request broker for C++ and Python. pkgver = 4.3.1 - pkgrel = 1 + pkgrel = 2 url = http://omniorb.sourceforge.net/ arch = x86_64 license = LGPL @@ -1,6 +1,6 @@ pkgname=omniorbpy pkgver=4.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="A CORBA object request broker for C++ and Python." arch=(x86_64) url="http://omniorb.sourceforge.net/" @@ -20,7 +20,8 @@ package() { cd "$srcdir/omniORBpy-$pkgver" make DESTDIR="$pkgdir" install - # remove conflicting files - rm -r "$pkgdir"/usr/lib/*/site-packages/omniidl_be/ + # remove conflicting files from omniorb package + rm "$pkgdir"/usr/lib/*/site-packages/omniidl_be/__init__.py + rm "$pkgdir"/usr/lib/*/site-packages/omniidl_be/__pycache__/__init__.* } |