summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Zou2024-02-12 21:30:02 +0100
committerMichel Zou2024-02-12 21:30:02 +0100
commit5815e3f20314738bc5158f8b83125891146f634e (patch)
treea9ea5674eb2858dfbb4d86ffc48faf46c76f18e0
parentf34941e58f7aa35b2c14f3a5ea7f7370033949a8 (diff)
downloadaur-5815e3f20314738bc5158f8b83125891146f634e.tar.gz
fix conflict
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD7
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 726fea9af5af..79f557e09467 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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
diff --git a/PKGBUILD b/PKGBUILD
index fef1ebaf6e35..9516b8434b34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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__.*
}