Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Refs #3338 -- Partially fix rpm packaging problems. There is still on…

…e 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
  • Loading branch information...
commit 22587230977e862a7e87723d538b5b5e48800494 1 parent a0c354e
Malcolm Tredinnick malcolmt authored
Showing with 27 additions and 5 deletions.
  1. +1 −1  AUTHORS
  2. +6 −4 MANIFEST.in
  3. +19 −0 scripts/rpm-install.sh
  4. +1 −0  setup.cfg
2  AUTHORS
View
@@ -67,6 +67,7 @@ answer newbie questions, and generally made Django that much better:
crankycoder@gmail.com
Matt Croydon <http://www.postneo.com/>
dackze+django@gmail.com
+ Dirk Datzert <dummy@habmalnefrage.de>
Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/>
dave@thebarproject.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
dne@mayonnaise.net
Maximillian Dornseif <md@hudora.de>
- dummy@habmalnefrage.de
Jeremy Dunck <http://dunck.us/>
Andy Dustman <farcepest@gmail.com>
Clint Ecker
10 MANIFEST.in
View
@@ -1,8 +1,10 @@
include AUTHORS
include INSTALL
include LICENSE
+recursive-include docs *
+recursive-include scripts *
recursive-include django/conf/locale *
-recursive-include django/contrib/admin/templates
-recursive-include django/contrib/admin/media
-recursive-include django/contrib/comments/templates
-recursive-include django/contrib/sitemaps/templates
+recursive-include django/contrib/admin/templates *
+recursive-include django/contrib/admin/media *
+recursive-include django/contrib/comments/templates *
+recursive-include django/contrib/sitemaps/templates *
19 scripts/rpm-install.sh
View
@@ -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
1  setup.cfg
View
@@ -1,3 +1,4 @@
[bdist_rpm]
doc_files = docs/*.txt
+install-script = scripts/rpm-install.sh
Please sign in to comment.
Something went wrong with that request. Please try again.