From: maciek2w Date: Sat, 12 Aug 2006 10:20:17 +0000 (+0000) Subject: - PyXML is not required during build X-Git-Url: http://git.pld-linux.org/?p=packages%2FPyFileServer.git;a=commitdiff_plain;h=457883657e7625f0c7dc53bc232d286b31506e5e - PyXML is not required during build Changed files: PyFileServer-setup_py.patch -> 1.1 PyFileServer.spec -> 1.5 --- diff --git a/PyFileServer-setup_py.patch b/PyFileServer-setup_py.patch new file mode 100644 index 0000000..2c2b8aa --- /dev/null +++ b/PyFileServer-setup_py.patch @@ -0,0 +1,25 @@ +--- setup.py.orig 2006-08-12 12:09:21.000000000 +0200 ++++ setup.py 2006-08-12 12:09:39.000000000 +0200 +@@ -11,14 +11,14 @@ + #manual check for dependencies: PyXML - somehow installer unable to find on PyPI. + import sys + +-print "\nChecking manual dependencies...\n" +-try: +- import xml.dom.ext +- import xml.dom.ext.reader +-except ImportError: +- print "Failed to detect PyXML. PyXML is required for PyFileServer. Please install" +- print "PyXML before installing PyFileServer" +- sys.exit(-1) ++#print "\nChecking manual dependencies...\n" ++#try: ++# import xml.dom.ext ++# import xml.dom.ext.reader ++#except ImportError: ++# print "Failed to detect PyXML. PyXML is required for PyFileServer. Please install" ++# print "PyXML before installing PyFileServer" ++# sys.exit(-1) + + + from setuptools import setup, find_packages diff --git a/PyFileServer.spec b/PyFileServer.spec index dca7572..2515d48 100644 --- a/PyFileServer.spec +++ b/PyFileServer.spec @@ -1,7 +1,3 @@ -# -# TODO: -# - check if PyXML is really required during build -# Summary: A WebDAV server in Python Summary(pl): Serwer WebDAV napisany w Pythonie Name: PyFileServer @@ -12,6 +8,7 @@ Group: Networking/Daemons Source0: http://download.berlios.de/pyfilesync/PyFileServer-0.2.1.zip # Source0-md5: 7a46d3f94e05d81b4110e6d0780c642b URL: http://pyfilesync.berlios.de/pyfileserver.html +Patch0: %{name}-setup_py.patch BuildRequires: python >= 2.3 BuildRequires: python-setuptools BuildRequires: unzip @@ -51,6 +48,7 @@ udost %prep %setup -q -n %{name} +%patch0 %build python setup.py build