Testing: First release of the release 3 series

1 files changed, 12 insertions, 11 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7d29d9ff4b7e..1a126e003216 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,8 @@
 # Previously:John Lane <archlinux at jelmail dot com>
 # Previously:Fisher Duan <steamedfish@njuopen.com> Ryan Corder <ryanc@greengrey.org>
 
-pkgname=cyrus-imapd
+pkgname=cyrus-imapd-new
+altpkgname=cyrus-imapd
 pkgver=3.0.8
 pkgrel=1
 pkgdesc="Cyrus IMAP mail server"
@@ -14,8 +15,8 @@ provides=('imap-server' 'pop3-server')
 conflicts=('imap-server' 'pop3-server')
 options=('!makeflags')
 backup=(etc/cyrus/cyrus.conf etc/cyrus/imapd.conf)
-install="$pkgname.install"
-source=(https://www.cyrusimap.org/releases/$pkgname-$pkgver.tar.gz
+install="$altpkgname.install"
+source=(https://www.cyrusimap.org/releases/$altpkgname-$pkgver.tar.gz
         'cyrus-master-conf.d'
         'cyrus-imapd.install'
         'cyrus-master.service')
@@ -25,7 +26,7 @@ sha512sums=('f4aa9877e62479439bee2ca29f452bd7e9daa091c19bf3567aa7f493f5163c98b44
             '6cc4bbed0d5342a28a69e4acfa4a89f7a8909c6271e2e819e8da855dca2873fdaa5cea6519cb09c169b507df273d030eff5677bb07c4bf6591939958dd8e1bfe')
 
 build() {
-    cd $srcdir/$pkgname-$pkgver
+    cd $srcdir/$altpkgname-$pkgver
 
     CFLAGS=-fPIC ./configure \
      --prefix=/usr \
@@ -47,7 +48,7 @@ build() {
 }
 
 package() {
-    cd $srcdir/$pkgname-$pkgver
+    cd $srcdir/$altpkgname-$pkgver
 
     make DESTDIR="${pkgdir}" install
 
@@ -59,7 +60,7 @@ package() {
     mkdir -m 0755 -p $pkgdir/etc/rc.d
     mkdir -m 0755 -p $pkgdir/usr/bin
     
-    install -m 755 ${srcdir}/$pkgname-$pkgver/tools/mkimap ${pkgdir}/usr/bin/
+    install -m 755 ${srcdir}/$altpkgname-$pkgver/tools/mkimap ${pkgdir}/usr/bin/
     
     # rename master.8 so it doesn't conflict with master.8 from Postfix
     mv $pkgdir/usr/share/man/man8/master.8 $pkgdir/usr/share/man/man8/cyrus-master.8
@@ -69,7 +70,7 @@ package() {
     rmdir $pkgdir/usr/bin/site_perl
 
     # install configs, rc scripts, etc
-    install -m 600 $srcdir/$pkgname-$pkgver/master/conf/normal.conf \
+    install -m 600 $srcdir/$altpkgname-$pkgver/master/conf/normal.conf \
         $pkgdir/etc/cyrus/cyrus.conf
     echo "# see imapd.conf(5) man page for correct setup of this file" >> \
         $pkgdir/etc/cyrus/imapd.conf
@@ -77,10 +78,10 @@ package() {
     install -m 644 $srcdir/cyrus-master-conf.d $pkgdir/etc/conf.d/cyrus-master
     install -m 644 $srcdir/cyrus-master.service \
         $pkgdir/usr/lib/systemd/system/cyrus-master.service
-    install -Dm 644 $srcdir/$pkgname-$pkgver/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
-    install -Dm 644 $srcdir/$pkgname-$pkgver/README \
-        $pkgdir/usr/share/doc/$pkgname/README
+    install -Dm 644 $srcdir/$altpkgname-$pkgver/COPYING \
+        $pkgdir/usr/share/licenses/$altpkgname/COPYING
+    install -Dm 644 $srcdir/$altpkgname-$pkgver/README \
+        $pkgdir/usr/share/doc/$altpkgname/README
 }