rewrite and fix version

3 files changed, 39 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 278f84652731..0c149917e5a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = kicad-library-digikey-git
-	pkgdesc = Part footprints and symbols for KiCAD from Digi-Key
-	pkgver = r228.0802230
+	pkgdesc = An atomic parts library for Ki-Cad by Digi-Key
+	pkgver = v1.2.r43.ge10fdb7
 	pkgrel = 1
-	url = https://github.com/digikey/digikey-kicad-library
+	url = https://github.com/Digi-Key/digikey-kicad-library
 	arch = any
 	license = CC-BY-SA 4.0
 	makedepends = git
-	depends = kicad
 	provides = kicad-library-digikey
-	conflicts = digikey-kicad-library
-	conflicts = kicad-digikey-library
-	source = git+https://github.com/digikey/digikey-kicad-library.git
-	md5sums = SKIP
+	conflicts = kicad-library-digikey
+	options = !strip
+	source = git+https://github.com/Digi-Key/digikey-kicad-library.git
+	sha256sums = SKIP
 
 pkgname = kicad-library-digikey-git
 
diff --git a/.gitignore b/.gitignore
index 3e5dbf16d23e..16aec40c288d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-digikey-kicad-library/
-pkg/
 src/
-*.tar.gz
-*.tar.xz
+pkg/
+digikey-kicad-library/
diff --git a/PKGBUILD b/PKGBUILD
index 9bc1c6cb93d7..ff0da3d861bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,40 @@
+# Maintainer: Grey Christoforo <first name at last name dot net>
+
 pkgname=kicad-library-digikey-git
-pkgver=r228.0802230
+pkgver=v1.2.r43.ge10fdb7
 pkgrel=1
-pkgdesc="Part footprints and symbols for KiCAD from Digi-Key"
-arch=('any')
-url="https://github.com/digikey/digikey-kicad-library"
+pkgdesc="An atomic parts library for Ki-Cad by Digi-Key"
+arch=(any)
+url=https://github.com/Digi-Key/digikey-kicad-library
 license=('CC-BY-SA 4.0')
-makedepends=('git')
-depends=('kicad')
-conflicts=('digikey-kicad-library' 'kicad-digikey-library')
-provides=('kicad-library-digikey')
-_reponame=digikey-kicad-library
-source=("git+https://github.com/digikey/${_reponame}.git")
-md5sums=('SKIP')
+options=('!strip')
+makedepends=(
+git
+)
+conflicts=(kicad-library-digikey)
+provides=(kicad-library-digikey)
+source=(
+git+https://github.com/Digi-Key/digikey-kicad-library.git
+)
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/$_reponame"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd digikey-kicad-library
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-#build() {
-#  cd "$srcdir"
-#  mkdir -p "$srcdir/build/"
-#  cd "$srcdir/build"
-#  cmake ../${_reponame} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
-#}
-
 package() {
+  cd digikey-kicad-library
+
   # footprints
-  _DEST_DIR="usr/share/kicad/modules"
-  mkdir -p "${pkgdir}/${_DEST_DIR}"
-  cp -a "${srcdir}/${_reponame}"/digikey-footprints.pretty "${pkgdir}/${_DEST_DIR}/."
-  
-  # symbols
-  _DEST_DIR="usr/share/kicad/library"
-  mkdir -p "${pkgdir}/${_DEST_DIR}"
-  cp -a "${srcdir}/${_reponame}"/digikey-symbols/* "${pkgdir}/${_DEST_DIR}/."
+  install -m755 -d "${pkgdir}"/usr/share/kicad/modules
+  find . -name '*.pretty' -exec cp -r {} "${pkgdir}"/usr/share/kicad/modules \;
+
+  # schematic symbols
+  install -m755 -d "${pkgdir}"/usr/share/kicad/library
+  find . -name '*.lib' -exec cp -r {} "${pkgdir}"/usr/share/kicad/library \;
+  find . -name '*.dcm' -exec cp -r {} "${pkgdir}"/usr/share/kicad/library \;
+
+  install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 LICENSE.md
 }
+