From 5ad6b568a2d5bed03fa4e42d66794d9bd34a04b0 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Fri, 13 Mar 2015 16:59:36 -0300
Subject: [PATCH] Fixed build_rpm script

---
 .travis.yml     | 12 +++++++-----
 ci/build_rpm.sh | 11 ++++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f3f25b2..2cff2a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,18 @@
 language: python
 
+cache: apt
+
 python:
   - "2.7"
 
 env:
   - DJANGO_VERSION=1.7.3
 
-install:
-  - pip install coveralls flake8
-  - pip install django==${DJANGO_VERSION}
-  - pip install .
-  - psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres
+#install:
+#  - pip install coveralls flake8
+#  - pip install .
+#  - pip install django==${DJANGO_VERSION}
+#  - psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres
 
 script:
  # - python setup.py test
diff --git a/ci/build_rpm.sh b/ci/build_rpm.sh
index 74b399e..3e9c7b1 100755
--- a/ci/build_rpm.sh
+++ b/ci/build_rpm.sh
@@ -10,10 +10,11 @@ sudo mkdir -p /tmp/centos-7/root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 sudo cp dist/colab-*.tar.gz /tmp/centos-7/root/rpmbuild/SOURCES/
 sudo cp colab.spec /tmp/centos-7/root/rpmbuild/SPECS/
 sudo cp ci/colab.repo /tmp/centos-7/etc/yum.repos.d/
-sudo cp ci/softwarepublico.key/tmp/centos-7/etc/yum.repos.d/
+sudo cp ci/softwarepublico.key /tmp/centos-7/etc/yum.repos.d/
 
-sudo chroot /tmp/centos-7
+# Commands on chroot
+
+sudo chroot /tmp/centos-7/ yum install rpm-build
+sudo chroot /tmp/centos-7/ yum install python-virtualenv colab-deps
+sudo chroot /tmp/centos-7/ HOME=/root rpmbuild -ba /root/rpmbuild/SPECS/colab.spec
 
-yum install rpm-build
-yum install python-virtualenv colab-deps
-HOME=/root rpmbuild -ba /root/rpmbuild/SPECS/colab.spec
--
libgit2 0.21.2