Refs #3338 -- Partially fix rpm packaging problems. There is still one issue

remaining with how we construct the version numbers, but this change is useful
nonetheless. Patch from Dirk Datzert.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4490 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-02-12 00:33:24 +00:00
parent a0c354ee4e
commit 2258723097
4 changed files with 27 additions and 5 deletions

View File

@ -67,6 +67,7 @@ answer newbie questions, and generally made Django that much better:
crankycoder@gmail.com crankycoder@gmail.com
Matt Croydon <http://www.postneo.com/> Matt Croydon <http://www.postneo.com/>
dackze+django@gmail.com dackze+django@gmail.com
Dirk Datzert <dummy@habmalnefrage.de>
Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/> Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/>
dave@thebarproject.com dave@thebarproject.com
Jason Davies (Esaj) <http://www.jasondavies.com/> Jason Davies (Esaj) <http://www.jasondavies.com/>
@ -74,7 +75,6 @@ answer newbie questions, and generally made Django that much better:
deric@monowerks.com deric@monowerks.com
dne@mayonnaise.net dne@mayonnaise.net
Maximillian Dornseif <md@hudora.de> Maximillian Dornseif <md@hudora.de>
dummy@habmalnefrage.de
Jeremy Dunck <http://dunck.us/> Jeremy Dunck <http://dunck.us/>
Andy Dustman <farcepest@gmail.com> Andy Dustman <farcepest@gmail.com>
Clint Ecker Clint Ecker

View File

@ -1,8 +1,10 @@
include AUTHORS include AUTHORS
include INSTALL include INSTALL
include LICENSE include LICENSE
recursive-include docs *
recursive-include scripts *
recursive-include django/conf/locale * recursive-include django/conf/locale *
recursive-include django/contrib/admin/templates recursive-include django/contrib/admin/templates *
recursive-include django/contrib/admin/media recursive-include django/contrib/admin/media *
recursive-include django/contrib/comments/templates recursive-include django/contrib/comments/templates *
recursive-include django/contrib/sitemaps/templates recursive-include django/contrib/sitemaps/templates *

19
scripts/rpm-install.sh Normal file
View File

@ -0,0 +1,19 @@
#! /bin/sh
#
# this file is *inserted* into the install section of the generated
# spec file
#
# this is, what dist.py normally does
python setup.py install --root=${RPM_BUILD_ROOT} --record="INSTALLED_FILES"
for i in `cat INSTALLED_FILES`; do
if [ -f ${RPM_BUILD_ROOT}/$i ]; then
echo $i >>FILES
fi
if [ -d ${RPM_BUILD_ROOT}/$i ]; then
echo %dir $i >>DIRS
fi
done
cat DIRS FILES >INSTALLED_FILES

View File

@ -1,3 +1,4 @@
[bdist_rpm] [bdist_rpm]
doc_files = docs/*.txt doc_files = docs/*.txt
install-script = scripts/rpm-install.sh