From b56d39e46e1e057efd65e1ea8f9fbff83facab11 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 27 Jan 2010 16:07:07 +0000 Subject: [PATCH] Minor tweak for RPM building --- makepanda/makepanda.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 6570fbd23a..659404fb78 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -4810,10 +4810,6 @@ def MakeInstallerLinux(): PV=PYTHONV.replace("python", "") if (os.path.isdir("linuxroot")): oscmd("chmod -R 755 linuxroot") oscmd("rm -rf linuxroot data.tar.gz control.tar.gz panda3d.spec") - if (os.path.exists("/usr/bin/rpmbuild")): - oscmd("rm -rf `rpm -E '%_target_cpu'`") - if (os.path.exists("/usr/bin/dpkg-deb")): - oscmd("rm -rf `dpkg --print-architecture`") oscmd("mkdir linuxroot") # Invoke installpanda.py to install it into a temporary dir @@ -4832,6 +4828,7 @@ def MakeInstallerLinux(): WriteFile("panda3d.spec", txt) oscmd("rpmbuild --define '_rpmdir "+pandasource+"' --root "+pandasource+" --buildroot linuxroot -bb panda3d.spec") oscmd("mv "+ARCH+"/panda3d-"+VERSION+"-1."+ARCH+".rpm .") + oscmd("rmdir "+ARCH, True) if (os.path.exists("/usr/bin/dpkg-deb")): oscmd("dpkg --print-architecture > "+GetOutputDir()+"/tmp/architecture.txt")