Version 1.7.1-2

3 files changed, 16 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4071da9be209..c0a0169c01d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sweethome3d-3dmodels-trees
 	pkgdesc = Free 3D models advertised on SweetHome3D website
 	pkgver = 1.7.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.sweethome3d.com/freeModels.jsp
 	install = sweethome3d-3dmodels-trees.install
 	arch = any
@@ -14,6 +14,8 @@ pkgbase = sweethome3d-3dmodels-trees
 	optdepends = sweethome3d-3dmodels-lucapresidente: More 3D models
 	optdepends = sweethome3d-3dmodels-reallusion: More 3D models
 	optdepends = sweethome3d-3dmodels-scopia: More 3D models
+	optdepends = sweethome3d-textures-contributions: More textures
+	optdepends = sweethome3d-textures-scopia: More textures
 	source = http://prdownloads.sourceforge.net/sweethome3d/3DModels-Trees-1.7.1.zip
 	sha1sums = 93a6d482c02377795877cd416ab8ebcc184bc583
 
diff --git a/PKGBUILD b/PKGBUILD
index e4397dcb9600..81c6dc6d2bd4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexis BRENON <brenon.alexis+arch at gmail dot com>
 pkgname=sweethome3d-3dmodels-trees
 pkgver=1.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Free 3D models advertised on SweetHome3D website"
 arch=('any')
 url="http://www.sweethome3d.com/freeModels.jsp"
@@ -13,16 +13,18 @@ optdepends=("sweethome3d: Models rendering"
 "sweethome3d-3dmodels-katorlegaz: More 3D models"
 "sweethome3d-3dmodels-lucapresidente: More 3D models"
 "sweethome3d-3dmodels-reallusion: More 3D models"
-"sweethome3d-3dmodels-scopia: More 3D models")
+"sweethome3d-3dmodels-scopia: More 3D models"
+"sweethome3d-textures-contributions: More textures"
+"sweethome3d-textures-scopia: More textures")
 install="$pkgname.install"
 source=("http://prdownloads.sourceforge.net/sweethome3d/3DModels-Trees-1.7.1.zip")
 sha1sums=("93a6d482c02377795877cd416ab8ebcc184bc583")
 
 package() {
-    mkdir -p $pkgdir/usr/share/eteks/sweethome3d/furniture/trees
+    mkdir -p $pkgdir/usr/share/eteks/sweethome3d/furniture/3dmodels-trees
     I=0
     for lib in "${srcdir}"/*.sh3f; do
-        install -Dm644 "$lib" "$pkgdir/usr/share/eteks/sweethome3d/furniture/trees/trees-$(printf "%02d" "$I").sh3f"
+        install -Dm644 "$lib" "$pkgdir/usr/share/eteks/sweethome3d/furniture/3dmodels-trees/3dmodels-trees-$(printf "%02d" "$I").sh3f"
         I=$(( I + 1 ))
     done
     install -Dm644 "${srcdir}"/LICENSE* "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/sweethome3d-3dmodels-trees.install b/sweethome3d-3dmodels-trees.install
index ed6b7096a28b..bccd48b6063a 100644
--- a/sweethome3d-3dmodels-trees.install
+++ b/sweethome3d-3dmodels-trees.install
@@ -5,18 +5,22 @@ user_path=".eteks/sweethome3d/furniture/"
 post_install() {
     find /home/* -maxdepth 0 -type d \! -user root -print0 | while IFS= read -r -d '' user_home; do
         mkdir -p "${user_home}/${user_path}"
-        for lib in /usr/share/eteks/sweethome3d/furniture/trees/*.sh3f; do
+        for lib in /usr/share/eteks/sweethome3d/furniture/3dmodels-trees/*.sh3f; do
             ln -s "$lib" "${user_home}/${user_path}/"
         done
+        chown --no-dereference --preserve-root --recursive --reference="${user_home}" "${user_home}/${user_path}"
     done
 }
 
 # arg 1:  the old package version
 pre_remove() {
     find /home/* -maxdepth 0 -type d \! -user root -print0 | while IFS= read -r -d '' user_home; do
-        rm -f "${user_home}/${user_path}/trees-*.sh3f"
+        rm -f "${user_home}/${user_path}/3dmodels-trees-*.sh3f"
         (
-            cd "${user_home}" && rmdir --ignore-fail-on-non-empty -p "${user_path}"
+            cd "${user_home}"
+            if [ -d "${user_path}" ]; then
+                rmdir --ignore-fail-on-non-empty -p "${user_path}"
+            fi
         )
     done
 }