From 584a844e719e5d816738ae07c98a1caff68b7480 Mon Sep 17 00:00:00 2001
From: pablo <none@none>
Date: Tue, 16 Jun 2009 17:10:43 +0100
Subject: [PATCH] Fixed distutils packaging for all setup.py bdist formats

--HG--
rename : scrapy/bin/scrapy-admin.py => bin/scrapy-admin.py
---
 MANIFEST.in                         | 10 ++++++++++
 {scrapy/bin => bin}/scrapy-admin.py |  0
 scripts/rpm-install.sh              | 19 +++++++++++++++----
 setup.cfg                           |  6 ------
 setup.py                            |  2 +-
 5 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 MANIFEST.in
 rename {scrapy/bin => bin}/scrapy-admin.py (100%)

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 000000000..154817ec8
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,10 @@
+include README
+include AUTHORS
+include INSTALL
+include LICENSE
+include MANIFEST.in
+recursive-include docs *
+recursive-include scripts *
+recursive-include examples *
+recursive-include extras *
+recursive-include bin *
diff --git a/scrapy/bin/scrapy-admin.py b/bin/scrapy-admin.py
similarity index 100%
rename from scrapy/bin/scrapy-admin.py
rename to bin/scrapy-admin.py
diff --git a/scripts/rpm-install.sh b/scripts/rpm-install.sh
index 710f18671..467aafaad 100644
--- a/scripts/rpm-install.sh
+++ b/scripts/rpm-install.sh
@@ -3,8 +3,19 @@
 # This file becomes the install section of the generated spec file.
 #
 
-python setup.py install --root=${RPM_BUILD_ROOT} --record="INSTALLED_FILES"
+python2.5 setup.py install --root=${RPM_BUILD_ROOT} --record="INSTALLED_FILES"
 
-cat << EOF >> INSTALLED_FILES
-/usr/bin/*.py*
-EOF
+# 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
+  fi
+  if [ -d ${RPM_BUILD_ROOT}/$i ]; then
+    echo %dir $i >>DIRS
+  fi
+done
+
+# 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
diff --git a/setup.cfg b/setup.cfg
index 3d98a400d..8bc7a0c1a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,9 +1,3 @@
 [bdist_rpm]
 doc_files = docs examples extras AUTHORS INSTALL LICENSE README
 install-script = scripts/rpm-install.sh
-
-[install]
-optimize = 1
-
-[aliases]
-rpm = bdist_rpm --binary-only clean -a
diff --git a/setup.py b/setup.py
index 8d06051e2..e97f30735 100644
--- a/setup.py
+++ b/setup.py
@@ -93,5 +93,5 @@ setup(
     packages = packages,
     cmdclass = cmdclasses,
     data_files = data_files,
-    scripts = ['scrapy/bin/scrapy-admin.py'],
+    scripts = ['bin/scrapy-admin.py'],
 )
-- 
GitLab