diff options
| author | Boulder Sprinters <boulder-sprinters@djangoproject.com> | 2007-04-05 16:17:35 +0000 |
|---|---|---|
| committer | Boulder Sprinters <boulder-sprinters@djangoproject.com> | 2007-04-05 16:17:35 +0000 |
| commit | a9b2c0686d98f78ca365a04057699a44f7711914 (patch) | |
| tree | 451caf3f856bb51e72c2b88d5fcefbedbadf7b01 /scripts | |
| parent | 5bcf13b607ea92c34d13cbb52f70c1e6b76ce5cd (diff) | |
boulder-oracle-sprint: Merged to [4934].
git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@4935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rpm-install.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/scripts/rpm-install.sh b/scripts/rpm-install.sh index 07a087c447..d3d95bcdb1 100644 --- a/scripts/rpm-install.sh +++ b/scripts/rpm-install.sh @@ -1,12 +1,14 @@ #! /bin/sh # -# this file is *inserted* into the install section of the generated -# spec file +# This file becomes the install section of the generated spec file. # -# this is, what dist.py normally does +# This is what dist.py normally does. python setup.py install --root=${RPM_BUILD_ROOT} --record="INSTALLED_FILES" +# Sort the filelist so that directories appear before files. This avoids +# duplicate filename problems on some systems. +touch DIRS for i in `cat INSTALLED_FILES`; do if [ -f ${RPM_BUILD_ROOT}/$i ]; then echo $i >>FILES @@ -16,4 +18,6 @@ for i in `cat INSTALLED_FILES`; do fi done -cat DIRS FILES >INSTALLED_FILES +# Make sure we match foo.pyo and foo.pyc along with foo.py (but only once each) +sed -e "/\.py[co]$/d" -e "s/\.py$/.py*/" DIRS FILES >INSTALLED_FILES + |