From bdcc95e5cce2754d78055f86d561ba2be92ba854 Mon Sep 17 00:00:00 2001
From: Jeremy Dunck <jdunck@gmail.com>
Date: Mon, 18 Jun 2007 16:48:27 +0000
Subject: gis: Merged revisions 4786-5490 via svnmerge from
 http://code.djangoproject.com/svn/django/trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5492 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 scripts/rpm-install.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/rpm-install.sh b/scripts/rpm-install.sh
index 07a087c447..f337a789b1 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,11 @@ 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
+
+mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man1/
+cp docs/man/* ${RPM_BUILD_ROOT}/%{_mandir}/man1/
+cat << EOF >> INSTALLED_FILES
+%doc %{_mandir}/man1/*"
+EOF
-- 
cgit v1.3