# HG changeset patch # User Samuel Trégouët # Date 1454671588 -3600 # Node ID 13c9cd75f097030d9f064957b06f786f612f1e2f # Parent f28a5c19d4ed04e353ef98a0485bf5ed23e06c0a [pkg] do not include toplevel directories in rpm (closes #10362119) Our spec file conflicts with the filesystem package in centos7: we set permissions to 0755 for /usr/bin and /usr/lib whereas filesystem sets them to 0555. So to be compatible with both centos7 and others we simply ignore these directories. diff -r f28a5c19d4ed -r 13c9cd75f097 cubicweb.spec --- a/cubicweb.spec Fri Feb 05 10:30:01 2016 +0100 +++ b/cubicweb.spec Fri Feb 05 12:26:28 2016 +0100 @@ -5,6 +5,7 @@ %define python python %define __python /usr/bin/python %endif +%{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: cubicweb Version: 3.22.0 @@ -57,5 +58,6 @@ %files %defattr(-, root, root) %dir /var/log/cubicweb -/* - +%{_prefix}/share/cubicweb/* +%{_python_sitelib}/* +%{_bindir}/* diff -r f28a5c19d4ed -r 13c9cd75f097 skeleton/DISTNAME.spec.tmpl --- a/skeleton/DISTNAME.spec.tmpl Fri Feb 05 10:30:01 2016 +0100 +++ b/skeleton/DISTNAME.spec.tmpl Fri Feb 05 12:26:28 2016 +0100 @@ -44,4 +44,4 @@ %%files %%defattr(-, root, root) -/* +%%{_prefix}/share/cubicweb/cubes/*