diff options
author | Grey Christoforo | 2019-12-17 10:57:18 +0000 |
---|---|---|
committer | Grey Christoforo | 2019-12-17 10:57:18 +0000 |
commit | ff2a47ce4a8127a72f252a83e2134cac8b2ea4db (patch) | |
tree | b52afeb6368b8be5b7ba102b0730e0aebdc8d71f | |
parent | 3456e9efd58080c008e3afc335b50c2654901b37 (diff) | |
download | aur-ff2a47ce4a8127a72f252a83e2134cac8b2ea4db.tar.gz |
fix conflicts and provides
-rw-r--r-- | .SRCINFO | 19 | ||||
-rw-r--r-- | PKGBUILD | 12 |
2 files changed, 19 insertions, 12 deletions
@@ -6,12 +6,6 @@ pkgbase = kicad-library-git license = GPL makedepends = cmake makedepends = git - provides = kicad-footprints - conflicts = kicad-library-bzr - conflicts = kicad-library-git - conflicts = kicad-library-3d - conflicts = kicad-library - conflicts = kicad-footprints options = !strip source = git://github.com/KiCad/kicad-symbols.git source = git://github.com/KiCad/kicad-footprints.git @@ -23,8 +17,17 @@ pkgbase = kicad-library-git md5sums = SKIP pkgname = kicad-library-git - pkgdesc = Kicad component libraries, footprint libraries and templates + pkgdesc = Kicad component libraries, footprint libraries and templates from git + provides = kicad-library + conflicts = kicad-library-bzr + conflicts = kicad-library + conflicts = kicad-footprints + conflicts = kicad-footprints-git + conflicts = kicad-symbols-git + conflicts = kicad-templates-git pkgname = kicad-library-3d-git - pkgdesc = Kicad 3D render model libraries + pkgdesc = Kicad 3D render model libraries from git + provides = kicad-library-3d + conflicts = kicad-library-3d @@ -9,8 +9,6 @@ url="https://github.com/KiCad" license=('GPL') makedepends=('cmake' 'git') options=('!strip') -conflicts=('kicad-library-bzr' 'kicad-library-git' 'kicad-library-3d' 'kicad-library' 'kicad-footprints') -provides=('kicad-footprints') source=("git://github.com/KiCad/kicad-symbols.git" "git://github.com/KiCad/kicad-footprints.git" @@ -46,7 +44,10 @@ build() { } package_kicad-library-git() { - pkgdesc="Kicad component libraries, footprint libraries and templates" + pkgdesc="Kicad component libraries, footprint libraries and templates from git" + conflicts=('kicad-library-bzr' 'kicad-library' 'kicad-footprints' 'kicad-footprints-git' 'kicad-symbols-git' 'kicad-templates-git') + provides=('kicad-library') + cd "$srcdir/kicad-symbols" make DESTDIR="$pkgdir" install @@ -58,7 +59,10 @@ package_kicad-library-git() { } package_kicad-library-3d-git() { - pkgdesc="Kicad 3D render model libraries" + pkgdesc="Kicad 3D render model libraries from git" + conflicts=('kicad-library-3d') + provides=('kicad-library-3d') + cd "$srcdir/kicad-packages3D/" make DESTDIR="$pkgdir" install } |