summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarel Ben-Attia <harelba@gmail.com>2019-11-30 18:16:54 +0200
committerHarel Ben-Attia <harelba@gmail.com>2019-11-30 18:16:54 +0200
commitfa1665c4ceefa6bc1601d7587871dc4daf27cfe4 (patch)
treeadbd43113369856440489abac8d9f8e5204abaec
parent26d04e92a53dbd7eb826c97ad174cc23ae6f455c (diff)
fix rpm/deb to use binary executable instead of python source
-rw-r--r--.gitignore1
-rwxr-xr-xdist/create-rpm4
-rw-r--r--dist/q-text-as-data.spec.template2
-rwxr-xr-xpackage-release4
4 files changed, 5 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index a1e0486..8f68670 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,3 @@ win_build
packages
.idea/
dist/windows/
-dist/
diff --git a/dist/create-rpm b/dist/create-rpm
index e0f00a0..753da2d 100755
--- a/dist/create-rpm
+++ b/dist/create-rpm
@@ -43,8 +43,8 @@ mkdir -p ${rpm_build_area}/SOURCES
pushd ${rpm_build_area}/SOURCES >/dev/null
tar xvzf ./q.tar.gz --strip-components=1
rm -vf ./q.tar.gz
-wget -q -o ./q "https://github.com/harelba/q/releases/download/${VERSION}/q-x86_64-Linux"
-chmod +x ./q
+curl -R -L -o ./bin/q "https://github.com/harelba/q/releases/download/${VERSION}/q-x86_64-Linux"
+chmod +x ./bin/q
popd >/dev/null
find ${rpm_build_area}/ -ls
diff --git a/dist/q-text-as-data.spec.template b/dist/q-text-as-data.spec.template
index ad3d0c2..8512aa2 100644
--- a/dist/q-text-as-data.spec.template
+++ b/dist/q-text-as-data.spec.template
@@ -10,7 +10,7 @@ Summary: q - Text as Data
Group: Applications/Text
License: GPLv3
URL: https://github.com/harelba/q
-BuildArch: noarch
+BuildArch: x86_64
%description
q allows to perform SQL-like statements on tabular text data.
diff --git a/package-release b/package-release
index 0bbe604..3bb8197 100755
--- a/package-release
+++ b/package-release
@@ -29,7 +29,7 @@ mkdir -p ${base_folder}/packages
sleep 1
docker exec -it ${cid1} /bin/bash -i -c "/q/dist/create-rpm ${TAG}"
-docker cp ${cid1}:/q/dist/rpm_build_area/RPMS/noarch/q-text-as-data-${TAG}-1.el6.noarch.rpm ${base_folder}/packages/q-text-as-data-${TAG}-1.noarch.rpm
+docker cp ${cid1}:/q/dist/rpm_build_area/RPMS/x86_64/q-text-as-data-${TAG}-1.el6.x86_64.rpm ${base_folder}/packages/q-text-as-data-${TAG}-1.x86_64.rpm
-docker exec -it ${cid2} /bin/bash -i -c "cd /q/packages && alien ./q-text-as-data-${TAG}-1.noarch.rpm"
+docker exec -it ${cid2} /bin/bash -i -c "cd /q/packages && alien ./q-text-as-data-${TAG}-1.x86_64.rpm"