From 701fad9f3c4cdbc218db7326e7541325a9f99e8f Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 24 Mar 2009 09:42:50 +0000
Subject: [PATCH] Remove RPM dependency of Python - there's no standard naming
 convention. Also, fix packpanda on windows with new 'direct' changes.

---
 direct/src/directscripts/packpanda.nsi | 2 +-
 doc/makepanda/makepanda.py             | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/direct/src/directscripts/packpanda.nsi b/direct/src/directscripts/packpanda.nsi
index 9d005e4054..cb426cd14c 100755
--- a/direct/src/directscripts/packpanda.nsi
+++ b/direct/src/directscripts/packpanda.nsi
@@ -106,8 +106,8 @@ Section "${SMDIRECTORY}" SecCore
         File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\filter\*.sha"
         SetOutPath $INSTDIR\direct
         File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\*.py"
+        File "${PANDA}\tmp\__init__.py"
         !endif
-        File "${PANDA}\direct\__init__.py"
         SetOutPath $INSTDIR\pandac
         File /r "${PANDA}\pandac\*.py"
         SetOutPath $INSTDIR\python
diff --git a/doc/makepanda/makepanda.py b/doc/makepanda/makepanda.py
index d264471fd0..ca2a06f378 100755
--- a/doc/makepanda/makepanda.py
+++ b/doc/makepanda/makepanda.py
@@ -3578,6 +3578,7 @@ def MakeInstallerNSIS(file,fullname,smdirectory,installdir):
         os.remove(file)
     if (os.path.exists("nsis-output.exe")):
         os.remove("nsis-output.exe")
+    WriteFile("built/tmp/__init__.py", "")
     psource=os.path.abspath(".")
     panda=os.path.abspath(GetOutputDir())
     cmd="thirdparty/win-nsis/makensis /V2 "
@@ -3614,15 +3615,17 @@ Maintainer: etc-panda3d@lists.andrew.cmu.edu
 Description: The Panda3D free 3D engine
 """
 
+# We're not putting "python" in the "Requires" field,
+# since the rpm-based distros don't have a common
+# naming for the Python package.
 INSTALLER_SPEC_FILE="""
-Summary: Panda 3D Engine
+Summary: The Panda3D free 3D engine
 Name: panda3d
 Version: VERSION
 Release: 1
 License: BSD License
 Group: Development/Libraries
 BuildRoot: PANDASOURCE/linuxroot
-Requires: python (>= PV)
 %description
 The Panda3D engine.
 %post