leocad-18.01-2

 - Fix build (parts library changed upstream)

2 files changed, 7 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4723a9a280d..25a08de363a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,18 @@
 pkgbase = leocad
 	pkgdesc = A CAD program for creating virtual LEGO models
 	pkgver = 18.01
-	pkgrel = 1
+	pkgrel = 2
 	url = http://leocad.org
 	arch = i686
 	arch = x86_64
 	license = GPL
-	license = CCPL: cc-by-2.0
 	makedepends = qt5-tools
 	depends = qt5-base
 	depends = hicolor-icon-theme
 	source = leocad-18.01.tar.gz::https://github.com/leozide/leocad/archive/v18.01.tar.gz
 	source = leocad-18.01-library.zip::https://github.com/leozide/leocad/releases/download/v18.01/Library-Linux-10289.zip
 	sha256sums = 9f10b66e8c05a8b559e11d05506d592e7c6eaad222cd6cfeb8a18aa33ee2999c
-	sha256sums = e71ef2b995be42aa1919eb755b118512105c0dd93d53b7e21c3189818d7ccfb8
+	sha256sums = d0a4f384a73b1d86cd7cfbbec4c9bc2168505a99f4ac9719316b0ee7841e7415
 
 pkgname = leocad
 
diff --git a/PKGBUILD b/PKGBUILD
index 28108d27ab33..43f5d2b7f02a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,20 +4,19 @@
 
 pkgname=leocad
 pkgver=18.01
-pkgrel=1
+pkgrel=2
 pkgdesc="A CAD program for creating virtual LEGO models"
 arch=('i686' 'x86_64')
 url="http://leocad.org"
-license=('GPL' 'CCPL: cc-by-2.0')
+license=('GPL')
 depends=('qt5-base' 'hicolor-icon-theme')
 makedepends=('qt5-tools')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/leozide/leocad/archive/v$pkgver.tar.gz"
         "$pkgname-$pkgver-library.zip::https://github.com/leozide/leocad/releases/download/v$pkgver/Library-Linux-10289.zip")
 sha256sums=('9f10b66e8c05a8b559e11d05506d592e7c6eaad222cd6cfeb8a18aa33ee2999c'
-            'e71ef2b995be42aa1919eb755b118512105c0dd93d53b7e21c3189818d7ccfb8')
+            'd0a4f384a73b1d86cd7cfbbec4c9bc2168505a99f4ac9719316b0ee7841e7415')
 
 prepare() {
-  bsdtar -xf complete.zip
   mkdir -p build
 }
 
@@ -25,15 +24,12 @@ build() {
   cd build
   qmake-qt5 ../$pkgname-$pkgver \
     INSTALL_PREFIX=/usr \
-    DISABLE_UPDATE_CHECK=1 \
-    LDRAW_LIBRARY_PATH=/usr/share/leocad/ldraw
+    DISABLE_UPDATE_CHECK=1
   make
 }
 
 package() {
   cd build
   make INSTALL_ROOT="$pkgdir" install
-  install -d "$pkgdir"/usr/share/{leocad/ldraw,licenses/leocad}
-  cp -r ../ldraw/{models,p,parts,*.ldr} "$pkgdir"/usr/share/leocad/ldraw/
-  install -m644 ../ldraw/{CAlicense.txt,CAreadme.txt} "$pkgdir"/usr/share/licenses/leocad/
+  install -Dm644 ../library.bin "$pkgdir"/usr/share/leocad/library.bin
 }