Django

Code

Show
Ignore:
Timestamp:
06/18/07 11:48:27 (2 years ago)
Author:
jdunck
Message:

gis: Merged revisions 4786-5490 via svnmerge from
http://code.djangoproject.com/svn/django/trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-4785,4796-4797,4799-4809 to /django/trunk:1-5490

  • django/branches/gis/scripts/rpm-install.sh

    r4490 r5492  
    11#! /bin/sh 
    22# 
    3 # this file is *inserted* into the install section of the generated 
    4 # spec file 
     3# This file becomes the install section of the generated spec file. 
    54# 
    65 
    7 # this is, what dist.py normally does 
     6# This is what dist.py normally does. 
    87python setup.py install --root=${RPM_BUILD_ROOT} --record="INSTALLED_FILES" 
    98 
     9# Sort the filelist so that directories appear before files. This avoids 
     10# duplicate filename problems on some systems. 
     11touch DIRS 
    1012for i in `cat INSTALLED_FILES`; do 
    1113  if [ -f ${RPM_BUILD_ROOT}/$i ]; then 
    …… 
    1719done 
    1820 
    19 cat DIRS FILES >INSTALLED_FILES 
     21# Make sure we match foo.pyo and foo.pyc along with foo.py (but only once each) 
     22sed -e "/\.py[co]$/d" -e "s/\.py$/.py*/" DIRS FILES >INSTALLED_FILES 
     23 
     24mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man1/ 
     25cp docs/man/* ${RPM_BUILD_ROOT}/%{_mandir}/man1/ 
     26cat << EOF >> INSTALLED_FILES 
     27%doc %{_mandir}/man1/*" 
     28EOF