summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis BRENON2020-07-27 11:41:11 +0200
committerAlexis BRENON2020-07-27 11:41:11 +0200
commite1c5b0934c046863be328407ed8f4c5a858da012 (patch)
tree6499b2f0ec8218e0e4f0ecfd0b6e1735658e096a
parentb0e98963b86b7789109e59ee3a0791e28f92b921 (diff)
downloadaur-e1c5b0934c046863be328407ed8f4c5a858da012.tar.gz
Version 1.7.1-2
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD10
-rw-r--r--sweethome3d-3dmodels-reallusion.install10
3 files changed, 16 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d0c111b5578..25815cc94db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = sweethome3d-3dmodels-reallusion
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-reallusion.install
arch = any
@@ -14,6 +14,8 @@ pkgbase = sweethome3d-3dmodels-reallusion
optdepends = sweethome3d-3dmodels-lucapresidente: More 3D models
optdepends = sweethome3d-3dmodels-scopia: More 3D models
optdepends = sweethome3d-3dmodels-trees: More 3D models
+ optdepends = sweethome3d-textures-contributions: More textures
+ optdepends = sweethome3d-textures-scopia: More textures
source = http://prdownloads.sourceforge.net/sweethome3d/3DModels-Reallusion-1.7.1.zip
sha1sums = 738507d19d5670215e52616c9ab14c0abff17d5e
diff --git a/PKGBUILD b/PKGBUILD
index 8384856de4e..332dfcd1eef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Alexis BRENON <brenon.alexis+arch at gmail dot com>
pkgname=sweethome3d-3dmodels-reallusion
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-scopia: More 3D models"
-"sweethome3d-3dmodels-trees: More 3D models")
+"sweethome3d-3dmodels-trees: More 3D models"
+"sweethome3d-textures-contributions: More textures"
+"sweethome3d-textures-scopia: More textures")
install="$pkgname.install"
source=("http://prdownloads.sourceforge.net/sweethome3d/3DModels-Reallusion-1.7.1.zip")
sha1sums=("738507d19d5670215e52616c9ab14c0abff17d5e")
package() {
- mkdir -p $pkgdir/usr/share/eteks/sweethome3d/furniture/reallusion
+ mkdir -p $pkgdir/usr/share/eteks/sweethome3d/furniture/3dmodels-reallusion
I=0
for lib in "${srcdir}"/*.sh3f; do
- install -Dm644 "$lib" "$pkgdir/usr/share/eteks/sweethome3d/furniture/reallusion/reallusion-$(printf "%02d" "$I").sh3f"
+ install -Dm644 "$lib" "$pkgdir/usr/share/eteks/sweethome3d/furniture/3dmodels-reallusion/3dmodels-reallusion-$(printf "%02d" "$I").sh3f"
I=$(( I + 1 ))
done
install -Dm644 "${srcdir}"/LICENSE* "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/sweethome3d-3dmodels-reallusion.install b/sweethome3d-3dmodels-reallusion.install
index b03b8cab627..49317943166 100644
--- a/sweethome3d-3dmodels-reallusion.install
+++ b/sweethome3d-3dmodels-reallusion.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/reallusion/*.sh3f; do
+ for lib in /usr/share/eteks/sweethome3d/furniture/3dmodels-reallusion/*.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}/reallusion-*.sh3f"
+ rm -f "${user_home}/${user_path}/3dmodels-reallusion-*.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
}