summaryrefslogtreecommitdiffstats
path: root/redhat/buildenv.sh
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2014-02-01 14:56:14 +0100
committerFrançois Andriot <[email protected]>2014-02-01 14:56:14 +0100
commitebd751a0a30522160af8d4e3e44cf88382c1567c (patch)
tree5dc3776fdaa3a01de8015b8f1ab12bbc03efc432 /redhat/buildenv.sh
parent2684939e2168b39190416af1601f3e1830771064 (diff)
downloadtde-packaging-ebd751a0a30522160af8d4e3e44cf88382c1567c.tar.gz
tde-packaging-ebd751a0a30522160af8d4e3e44cf88382c1567c.zip
RPM Packaging: update build scripts
Diffstat (limited to 'redhat/buildenv.sh')
-rw-r--r--redhat/buildenv.sh4
1 files changed, 0 insertions, 4 deletions
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index aea4036dd..26dd017cd 100644
--- a/redhat/buildenv.sh
+++ b/redhat/buildenv.sh
@@ -12,10 +12,6 @@ export PATH="${PATH}:${TDE_GITBASEPKG}"
# Distribution suffix (e.g: .el6 , .mga3 ...)
export DIST="$( "${TDE_GITBASEPKG}/build/rpmdist.sh" --dist )"
-<<<<<<< HEAD
-=======
-#alias dist='~/bin/rpmdist.sh --dist'
->>>>>>> 650867080ee48b3e555a57f7ac0dab05eb4c6447
# Go to the RPMS folder
alias cdrpm='cd ~/rpmbuild/RPMS/RPMS${DIST}'