still have a conflict

2 files changed, 8 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a4d3d410f83e..af6e739b5550 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = coda
 	pkgdesc = A distributed file system with disconnected operation.
 	pkgver = 8.1.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://coda.cs.cmu.edu/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 2ab94b8feddb..416584cb89e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=coda
 pkgver=8.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A distributed file system with disconnected operation."
 depends=('bash' 'perl' 'python' 'python-attrs' 'python-setuptools')
 arch=(i686 x86_64 armv7h)
@@ -13,6 +13,12 @@ license=("GPL")
 
 prepare() {
   cd $pkgname-$pkgver
+  for f in al/pdbtool.c al/pdbtool.8 al/pdb.h al/Makefile.am auth2/passwd.coda.5 scripts/vice-setup-user.in ; do
+    sed -i -e 's,pdbtool,cpdbtool,g' coda-src/$f
+    sed -i -e 's,PDBTOOL,CPDBTOOL,g' coda-src/$f
+  done
+  mv coda-src/al/pdbtool.c coda-src/al/cpdbtool.c
+  mv coda-src/al/pdbtool.8 coda-src/al/cpdbtool.8
   sed -i -e 's,^LDFLAGS=,,' lib-src/rpc2/rp2gen/Makefile.am
   ./bootstrap.sh
 }