From f56270a2f9735c7d608aba7a6b0f9d2b26bac924 Mon Sep 17 00:00:00 2001 From: Harel Ben-Attia Date: Fri, 12 Dec 2014 10:36:06 -0500 Subject: Fixed RPM creation + some docs --- dist/create-rpm | 2 +- dist/pre-requisites | 4 +++- dist/q-text-as-data.spec.template | 9 +++------ 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'dist') diff --git a/dist/create-rpm b/dist/create-rpm index bd179f6..2f8f50f 100755 --- a/dist/create-rpm +++ b/dist/create-rpm @@ -48,6 +48,6 @@ curl -o ~/rpmbuild/SOURCES/q-${COMMIT_HASH}.tar.gz -L -R "https://github.com/har cat ${RPM_PACKAGE_NAME}.spec.template | sed "s/VERSION_PLACEHOLDER/$VERSION/g" | sed "s/COMMIT_HASH_PLACEHOLDER/${COMMIT_HASH}/g" | sed "s/SHORT_HASH_PLACEHOLDER/${SHORT_HASH}/g" > ~/rpmbuild/SPECS/${RPM_PACKAGE_NAME}.spec -rpmbuild --noclean -v -bb ~/rpmbuild/SPECS/${RPM_PACKAGE_NAME}.spec +rpmbuild -v -bb ~/rpmbuild/SPECS/${RPM_PACKAGE_NAME}.spec popd diff --git a/dist/pre-requisites b/dist/pre-requisites index c7ad784..1772614 100644 --- a/dist/pre-requisites +++ b/dist/pre-requisites @@ -2,4 +2,6 @@ sudo apt-get install gem sudo gem install ruby-ronn -pyinstaller +sudo apt-get install rpm +sudo apt-get install alien +pyinstaller (For windows version creation) diff --git a/dist/q-text-as-data.spec.template b/dist/q-text-as-data.spec.template index 8e44553..580f08c 100644 --- a/dist/q-text-as-data.spec.template +++ b/dist/q-text-as-data.spec.template @@ -11,7 +11,7 @@ Group: Applications/Text License: GPLv3 URL: https://github.com/harelba/q Source: q-COMMIT_HASH_PLACEHOLDER.tar.gz -BuildArch: x86_64 +BuildArch: noarch %description q allows to perform SQL-like statements on tabular text data. @@ -22,15 +22,13 @@ q allows to perform SQL-like statements on tabular text data. %build ls -ltr -pyinstaller -D --distpath=compiled-dist bin/q ronn doc/USAGE.markdown %install rm -vrf ${RPM_BUILD_ROOT}/ -export DONT_STRIP=1 install -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir} install -d -m 0755 ${RPM_BUILD_ROOT}%{_libdir}/q-text-as-data -install -Dm 0644 compiled-dist/q/* ${RPM_BUILD_ROOT}%{_libdir}/q-text-as-data/ +install -Dm 0644 bin/q ${RPM_BUILD_ROOT}%{_libdir}/q-text-as-data/ ln -s %{_libdir}/q-text-as-data/q ${RPM_BUILD_ROOT}%{_bindir}/q install -d -m 0755 ${RPM_BUILD_ROOT}%{_mandir}/man1/ install -m 0644 doc/USAGE ${RPM_BUILD_ROOT}%{_mandir}/man1/q.1 @@ -45,8 +43,7 @@ gzip ${RPM_BUILD_ROOT}%{_mandir}/man1/q.1 %doc %_mandir/man1/q.1.gz %changelog -*Sat Nov 29 2014 Harel Ben-Attia 1.5.0-1 -- Changed to use compiled version of q +*Fri Dec 12 2014 Harel Ben-Attia 1.5.0-1 - Moved stuff from create-rpm script into the rpm spec itself *Sat Jun 14 2014 Harel Ben-Attia 1.4.0-1 - Changed RPM package name to q-text-as-data -- cgit v1.2.3