Commits

Anonymous committed 6ddde2a

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.

  • Participants
  • Parent commits 2d2fcd2

Comments (0)

Files changed (4)

     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/>
     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
 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 *

File scripts/rpm-install.sh

+#! /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
 [bdist_rpm]
 doc_files = docs/*.txt
+install-script = scripts/rpm-install.sh