summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrey Christoforo2019-12-17 11:42:26 +0000
committerGrey Christoforo2019-12-17 11:42:26 +0000
commit1a67c33aa7cfba12fc946f00f91e088b1e3b3d94 (patch)
tree48fb12819c683fab4f57a2fb0877705043c64a18
parentff2a47ce4a8127a72f252a83e2134cac8b2ea4db (diff)
downloadaur-1a67c33aa7cfba12fc946f00f91e088b1e3b3d94.tar.gz
merge in 3d part files, remove split package
-rw-r--r--.SRCINFO23
-rw-r--r--PKGBUILD19
2 files changed, 15 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 32208e659b2b..ac23a764aeae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,5 @@
pkgbase = kicad-library-git
+ pkgdesc = Kicad component libraries, footprint libraries, component 3d models and project templates from git
pkgver = r5733.be973eca
pkgrel = 1
url = https://github.com/KiCad
@@ -6,6 +7,15 @@ pkgbase = kicad-library-git
license = GPL
makedepends = cmake
makedepends = git
+ provides = kicad-library
+ provides = kicad-library-3d
+ conflicts = kicad-library-3d
+ conflicts = kicad-library-bzr
+ conflicts = kicad-library
+ conflicts = kicad-footprints
+ conflicts = kicad-footprints-git
+ conflicts = kicad-symbols-git
+ conflicts = kicad-templates-git
options = !strip
source = git://github.com/KiCad/kicad-symbols.git
source = git://github.com/KiCad/kicad-footprints.git
@@ -17,17 +27,4 @@ pkgbase = kicad-library-git
md5sums = SKIP
pkgname = kicad-library-git
- 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 from git
- provides = kicad-library-3d
- conflicts = kicad-library-3d
diff --git a/PKGBUILD b/PKGBUILD
index 30e464d61414..90b0352a4b2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,10 @@
# Maintainer: Grey Christoforo <firstname@lastname.net>
-pkgbase=kicad-library-git
-pkgname=('kicad-library-git' 'kicad-library-3d-git')
+pkgname=kicad-library-git
pkgver=r5733.be973eca
+pkgdesc="Kicad component libraries, footprint libraries, component 3d models and project templates from git"
+conflicts=('kicad-library-3d' 'kicad-library-bzr' 'kicad-library' 'kicad-footprints' 'kicad-footprints-git' 'kicad-symbols-git' 'kicad-templates-git')
+provides=('kicad-library' 'kicad-library-3d')
pkgrel=1
arch=('any')
url="https://github.com/KiCad"
@@ -43,11 +45,7 @@ build() {
make
}
-package_kicad-library-git() {
- 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')
-
+package() {
cd "$srcdir/kicad-symbols"
make DESTDIR="$pkgdir" install
@@ -56,14 +54,7 @@ package_kicad-library-git() {
cd "$srcdir/kicad-templates/"
make DESTDIR="$pkgdir" install
-}
-package_kicad-library-3d-git() {
- pkgdesc="Kicad 3D render model libraries from git"
- conflicts=('kicad-library-3d')
- provides=('kicad-library-3d')
-
cd "$srcdir/kicad-packages3D/"
make DESTDIR="$pkgdir" install
}
-