Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 authored February 12, 2007
2  AUTHORS
@@ -67,6 +67,7 @@ answer newbie questions, and generally made Django that much better:
67 67
     crankycoder@gmail.com
68 68
     Matt Croydon <http://www.postneo.com/>
69 69
     dackze+django@gmail.com
  70
+    Dirk Datzert <dummy@habmalnefrage.de>
70 71
     Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/>
71 72
     dave@thebarproject.com
72 73
     Jason Davies (Esaj) <http://www.jasondavies.com/>
@@ -74,7 +75,6 @@ answer newbie questions, and generally made Django that much better:
74 75
     deric@monowerks.com
75 76
     dne@mayonnaise.net
76 77
     Maximillian Dornseif <md@hudora.de>
77  
-    dummy@habmalnefrage.de
78 78
     Jeremy Dunck <http://dunck.us/>
79 79
     Andy Dustman <farcepest@gmail.com>
80 80
     Clint Ecker
10  MANIFEST.in
... ...
@@ -1,8 +1,10 @@
1 1
 include AUTHORS
2 2
 include INSTALL
3 3
 include LICENSE
  4
+recursive-include docs *
  5
+recursive-include scripts *
4 6
 recursive-include django/conf/locale *
5  
-recursive-include django/contrib/admin/templates
6  
-recursive-include django/contrib/admin/media
7  
-recursive-include django/contrib/comments/templates
8  
-recursive-include django/contrib/sitemaps/templates
  7
+recursive-include django/contrib/admin/templates *
  8
+recursive-include django/contrib/admin/media *
  9
+recursive-include django/contrib/comments/templates *
  10
+recursive-include django/contrib/sitemaps/templates *
19  scripts/rpm-install.sh
... ...
@@ -0,0 +1,19 @@
  1
+#! /bin/sh
  2
+#
  3
+# this file is *inserted* into the install section of the generated
  4
+# spec file
  5
+#
  6
+
  7
+# this is, what dist.py normally does
  8
+python setup.py install --root=${RPM_BUILD_ROOT} --record="INSTALLED_FILES"
  9
+
  10
+for i in `cat INSTALLED_FILES`; do
  11
+  if [ -f ${RPM_BUILD_ROOT}/$i ]; then
  12
+    echo $i >>FILES
  13
+  fi
  14
+  if [ -d ${RPM_BUILD_ROOT}/$i ]; then
  15
+    echo %dir $i >>DIRS
  16
+  fi
  17
+done
  18
+
  19
+cat DIRS FILES >INSTALLED_FILES
1  setup.cfg
... ...
@@ -1,3 +1,4 @@
1 1
 [bdist_rpm]
2 2
 doc_files = docs/*.txt
  3
+install-script = scripts/rpm-install.sh
3 4
 

0 notes on commit 2258723

Please sign in to comment.
Something went wrong with that request. Please try again.