From f85a3a7ef93c80165ec8706bfd927dc3294d667b Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Sat, 5 Aug 2017 07:45:58 +0200 Subject: [PATCH] Code review: 322370043: Changed to setup.py to exclude non-script files from bdist_rpm #1299 --- config/dpkg/changelog | 2 +- setup.py | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/config/dpkg/changelog b/config/dpkg/changelog index babee2054b..2fce1b23bc 100644 --- a/config/dpkg/changelog +++ b/config/dpkg/changelog @@ -2,4 +2,4 @@ plaso (20170805-1) unstable; urgency=low * Auto-generated - -- Log2Timeline Sat, 05 Aug 2017 07:42:55 +0200 \ No newline at end of file + -- Log2Timeline Sat, 05 Aug 2017 07:45:56 +0200 \ No newline at end of file diff --git a/setup.py b/setup.py index 95f5d42d16..4544967353 100755 --- a/setup.py +++ b/setup.py @@ -110,8 +110,29 @@ def _make_spec_file(self): in_description = True elif line.startswith('%files'): - line = '%files -f INSTALLED_FILES -n {0:s}-%{{name}}'.format( - python_package) + # Cannot use %{_libdir} here since it can expand to "lib64". + lines = [ + '%files', + '%defattr(644,root,root,755)', + '%doc ACKNOWLEDGEMENTS AUTHORS LICENSE README', + '%{_prefix}/bin/*.py', + '%{_prefix}/lib/python*/site-packages/plaso/*.py', + '%{_prefix}/lib/python*/site-packages/plaso/*/*.py', + '%{_prefix}/lib/python*/site-packages/plaso/*/*/*.py', + '%{_prefix}/lib/python*/site-packages/plaso*.egg-info/*', + '%{_prefix}/share/plaso/*', + '%exclude %{_prefix}/lib/python*/site-packages/plaso/*.pyc', + '%exclude %{_prefix}/lib/python*/site-packages/plaso/*.pyo', + '%exclude %{_prefix}/lib/python*/site-packages/plaso/__pycache__/*', + '%exclude %{_prefix}/lib/python*/site-packages/plaso/*/*.pyc', + '%exclude %{_prefix}/lib/python*/site-packages/plaso/*/*.pyo', + '%exclude %{_prefix}/lib/python*/site-packages/plaso/*/__pycache__/*', + '%exclude %{_prefix}/lib/python*/site-packages/plaso/*/*/*.pyc', + '%exclude %{_prefix}/lib/python*/site-packages/plaso/*/*/*.pyo', + '%exclude %{_prefix}/lib/python*/site-packages/plaso/*/*/__pycache__/*'] + + python_spec_file.extend(lines) + break elif line.startswith('%prep'): in_description = False