summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-04-03 01:54:04 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-04-03 01:54:04 -0300
commit4a3f4f14c73044c6110df5f13e4a533087c76c60 (patch)
treed8d5a1173605792e4f72087db142f3ee89867023 /libre
parent05ab405289ce41d6afd39a3c1ed08ee7fa5190ce (diff)
parent6d93334da6e8f377d7858fb86afb698ec4af6274 (diff)
downloadabslibre-4a3f4f14c73044c6110df5f13e4a533087c76c60.tar.gz
abslibre-4a3f4f14c73044c6110df5f13e4a533087c76c60.tar.bz2
abslibre-4a3f4f14c73044c6110df5f13e4a533087c76c60.zip
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre')
-rw-r--r--libre/blender-libre/PKGBUILD17
1 files changed, 9 insertions, 8 deletions
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index c35d75b28..c5c200a32 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=blender
epoch=11
_pkgver=2.70
-pkgrel=2
+pkgrel=3
_jpgver=1.5
_pyver=3.4
@@ -13,7 +13,7 @@ _spn=false
_spndesc=' (with spacenav support)'
}
-pkgname=$_pkgname$_spnname-libre
+pkgname=$_pkgname-libre$_spnname
pkgver=$_pkgver
pkgdesc='Fully integrated 3D graphics creation suite, without nonfree cuda support'$_spndesc
arch=(
@@ -74,11 +74,12 @@ makedepends=(
llvm
mesa
)
-provides=($_pkgname)
-[[ $_spn == true ]] && provides+=("$_pkgname-libre=$epoch:$pkgver")
-conflicts=($_pkgname)
-[[ $_spn == true ]] && conflicts+=($_pkgname-libre)
-replaces=$_pkgname
+[[ $_spn != true ]] && provides=($_pkgname)
+[[ $_spn == true ]] && provides+=("$_pkgname-libre=$epoch:$pkgver" $_pkgname$_spnname-libre)
+[[ $_spn != true ]] && conflicts=($_pkgname)
+[[ $_spn == true ]] && conflicts+=($_pkgname-libre $_pkgname$_spnname-libre)
+[[ $_spn != true ]] && replaces=$_pkgname
+[[ $_spn == true ]] && replaces=$_pkgname$_spnname-libre
options=(!strip)
install=$_pkgname.install
source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz
@@ -94,7 +95,7 @@ prepare() {
[[ $_OS == GNU/kFreeBSD ]] && sed -i 's|BUILD_PLATFORM;|"GNU/kFreeBSD";|' source/creator/buildinfo.c
sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and BSD|
s|Linux, FreeBSD|GNU and BSD|
- s|Unpack the archive, Then run the Blender executable.|Intall from Parabola repo (pacman -S '"$pkgname"'), Then run blender.|
+ s|Unpack the archive, Then run the Blender executable.|Install from Parabola repo (pacman -S '"$pkgname"'), Then run blender.|
\|Windows|d;\|Mac OS X|d
s|The downloaded Blender package includes|The '"${pkgname^}"' package includes|
' release/text/readme.html