Date: Thursday, February 16, 2017 @ 11:53:46
Author: arojas
Revision: 289050
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
audiocd-kio4/repos/extra-i686/PKGBUILD
(from rev 289049, audiocd-kio4/trunk/PKGBUILD)
audiocd-kio4/repos/extra-x86_64/PKGBUILD
(from rev 289049, audiocd-kio4/trunk/PKGBUILD)
Deleted:
audiocd-kio4/repos/extra-i686/PKGBUILD
audiocd-kio4/repos/extra-x86_64/PKGBUILD
-----------------------+
/PKGBUILD | 78 ++++++++++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 36 ----------------------
extra-x86_64/PKGBUILD | 36 ----------------------
3 files changed, 78 insertions(+), 72 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-02-16 11:53:09 UTC (rev 289049)
+++ extra-i686/PKGBUILD 2017-02-16 11:53:46 UTC (rev 289050)
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 280288 2016-11-10 18:13:29Z arojas $
-# Maintainer: Antonio Rojas <aro...@archlinux.org>
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Andrea Scarpino <and...@archlinux.org>
-
-pkgname=audiocd-kio4
-pkgver=16.08.3
-pkgrel=1
-pkgdesc="Kioslave for accessing audio CDs"
-url='https://www.kde.org/applications/multimedia/'
-arch=(i686 x86_64)
-license=(GPL LGPL FDL)
-depends=(libkcddb4 libkcompactdisc4 lame)
-makedepends=(cmake automoc4)
-replaces=(kdemultimedia-kioslave kdemultimedia-audiocd-kio)
-conflicts=(kdemultimedia-kioslave kdemultimedia-audiocd-kio)
-source=("http://download.kde.org/stable/applications/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz";)
-sha256sums=('78988ef13f4228d94923d50dc54129a91d034ffcf014029dbc39bdb0cdedf8b4')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../audiocd-kio-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: audiocd-kio4/repos/extra-i686/PKGBUILD (from rev 289049,
audiocd-kio4/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-02-16 11:53:46 UTC (rev 289050)
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 280288 2016-11-10 18:13:29Z arojas $
+# Maintainer: Antonio Rojas <aro...@archlinux.org>
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+
+pkgname=audiocd-kio4
+pkgver=16.08.3
+pkgrel=2
+pkgdesc="Kioslave for accessing audio CDs"
+url='https://www.kde.org/applications/multimedia/'
+arch=(i686 x86_64)
+license=(GPL LGPL FDL)
+depends=(libkcddb4 libkcompactdisc4 lame)
+makedepends=(cmake automoc4)
+replaces=(kdemultimedia-kioslave kdemultimedia-audiocd-kio)
+conflicts=(kdemultimedia-kioslave kdemultimedia-audiocd-kio)
+source=("http://download.kde.org/stable/applications/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz";)
+sha256sums=('78988ef13f4228d94923d50dc54129a91d034ffcf014029dbc39bdb0cdedf8b4')
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../audiocd-kio-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+
+# Fix conflicts with audiocd-kio
+ rm -r "$pkgdir"/usr/{include,lib/libaudiocdplugins.so,share/config.kcfg}
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-02-16 11:53:09 UTC (rev 289049)
+++ extra-x86_64/PKGBUILD 2017-02-16 11:53:46 UTC (rev 289050)
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 280288 2016-11-10 18:13:29Z arojas $
-# Maintainer: Antonio Rojas <aro...@archlinux.org>
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Andrea Scarpino <and...@archlinux.org>
-
-pkgname=audiocd-kio4
-pkgver=16.08.3
-pkgrel=1
-pkgdesc="Kioslave for accessing audio CDs"
-url='https://www.kde.org/applications/multimedia/'
-arch=(i686 x86_64)
-license=(GPL LGPL FDL)
-depends=(libkcddb4 libkcompactdisc4 lame)
-makedepends=(cmake automoc4)
-replaces=(kdemultimedia-kioslave kdemultimedia-audiocd-kio)
-conflicts=(kdemultimedia-kioslave kdemultimedia-audiocd-kio)
-source=("http://download.kde.org/stable/applications/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz";)
-sha256sums=('78988ef13f4228d94923d50dc54129a91d034ffcf014029dbc39bdb0cdedf8b4')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../audiocd-kio-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: audiocd-kio4/repos/extra-x86_64/PKGBUILD (from rev 289049,
audiocd-kio4/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-02-16 11:53:46 UTC (rev 289050)
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 280288 2016-11-10 18:13:29Z arojas $
+# Maintainer: Antonio Rojas <aro...@archlinux.org>
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+
+pkgname=audiocd-kio4
+pkgver=16.08.3
+pkgrel=2
+pkgdesc="Kioslave for accessing audio CDs"
+url='https://www.kde.org/applications/multimedia/'
+arch=(i686 x86_64)
+license=(GPL LGPL FDL)
+depends=(libkcddb4 libkcompactdisc4 lame)
+makedepends=(cmake automoc4)
+replaces=(kdemultimedia-kioslave kdemultimedia-audiocd-kio)
+conflicts=(kdemultimedia-kioslave kdemultimedia-audiocd-kio)
+source=("http://download.kde.org/stable/applications/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz";)
+sha256sums=('78988ef13f4228d94923d50dc54129a91d034ffcf014029dbc39bdb0cdedf8b4')
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../audiocd-kio-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+
+# Fix conflicts with audiocd-kio
+ rm -r "$pkgdir"/usr/{include,lib/libaudiocdplugins.so,share/config.kcfg}
+}
