summaryrefslogtreecommitdiffstats
path: root/dist/q-text-as-data.spec.template
diff options
context:
space:
mode:
authorHarel Ben-Attia <harelba@gmail.com>2014-12-10 19:45:44 -0500
committerHarel Ben-Attia <harelba@gmail.com>2014-12-10 19:47:59 -0500
commit2147ccc0174a62ada6e0381f27e08ec08a3ba897 (patch)
treef3c0e6416621129d6b5c1eae3ebbaf537ff0038f /dist/q-text-as-data.spec.template
parent9e31efe6bbf6ca19979482afc801d69caf343bc4 (diff)
Multiple queries on CLI + Reuse of loaded data + Full code refactoring (full python API) + RPM compiles q to binary
Included changes: pick 8b4342d Refactored q to expose objects, and added a python package wrapper pick b0d28b1 Internalized exception handling into the q main object pick faf3904 Added reuse of loaded data + stdin injection to module API + tests pick 08cf2bb Allow different input params for each loaded file + loading file manually + fixed modeling of query encoding + tests pick 3a7fffd Separation of populate phases pick 92d0bb6 Provide table structure as part of responses + merge _populate method versions pick d04a24c Multiple queries on CLI + load data from string API + finer details in table structure response + tests pick d90c392 modified non existent file error msg + fixed response bug in table_structure when there are errors pick 5908a75 Fixed bug in str of the response pick a9dcc74 New RPM creation which matches commit hash to version, and compiles q pick 90fd18a Fixed permissions for new RPM.
Diffstat (limited to 'dist/q-text-as-data.spec.template')
-rw-r--r--dist/q-text-as-data.spec.template33
1 files changed, 25 insertions, 8 deletions
diff --git a/dist/q-text-as-data.spec.template b/dist/q-text-as-data.spec.template
index 16ffac0..8e44553 100644
--- a/dist/q-text-as-data.spec.template
+++ b/dist/q-text-as-data.spec.template
@@ -1,3 +1,7 @@
+%global _enable_debug_package 0
+%global debug_package %{nil}
+%global __os_install_post %{nil}
+
Name: q-text-as-data
Version: VERSION_PLACEHOLDER
Release: 1%{?dist}
@@ -6,31 +10,44 @@ Summary: q - Text as Data
Group: Applications/Text
License: GPLv3
URL: https://github.com/harelba/q
-Source0: %{name}-%{version}.tar.gz
-BuildArch: noarch
+Source: q-COMMIT_HASH_PLACEHOLDER.tar.gz
+BuildArch: x86_64
%description
q allows to perform SQL-like statements on tabular text data.
+
%prep
-%setup
+%setup -qn harelba-q-SHORT_HASH_PLACEHOLDER
+
+%build
+ls -ltr
+pyinstaller -D --distpath=compiled-dist bin/q
+ronn doc/USAGE.markdown
%install
-rm -rf ${RPM_BUILD_ROOT}
+rm -vrf ${RPM_BUILD_ROOT}/
+export DONT_STRIP=1
install -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir}
-install -Dm 755 bin/q ${RPM_BUILD_ROOT}%{_bindir}/
-install -Dm 755 bin/q ${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/
+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
gzip ${RPM_BUILD_ROOT}%{_mandir}/man1/q.1
%files
%defattr(-,root,root,-)
-%doc README.markdown doc/*
-%{_bindir}/q
+%doc README.markdown doc/AUTHORS doc/CHANGELOG.markdown doc/IMPLEMENTATION.markdown doc/INSTALL.markdown doc/LICENSE doc/RATIONALE.markdown doc/THANKS doc/USAGE.markdown
+%attr(755,root,root) %{_bindir}/q
+%attr(755,root,root) %{_libdir}/q-text-as-data/q
+%{_libdir}/q-text-as-data
%doc %_mandir/man1/q.1.gz
%changelog
+*Sat Nov 29 2014 Harel Ben-Attia <harelba@gmail.com> 1.5.0-1
+- Changed to use compiled version of q
+- Moved stuff from create-rpm script into the rpm spec itself
*Sat Jun 14 2014 Harel Ben-Attia <harelba@gmail.com> 1.4.0-1
- Changed RPM package name to q-text-as-data
- Fixed RPM creation logic after folder restructuring