Various packaging updates and bugfixes

Matt Fox · Matt Fox · commit d1e9232b8abe · 2011-05-12T14:08:37.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 *.so
 build/
 dist/
+MANIFEST
diff --git a/MANIFEST b/MANIFEST
@@ -1,5 +1,7 @@
 CHANGES.txt
 LICENSE.txt
-README.txt
+README.rst
+netfilterqueue.c
+netfilterqueue.pxd
 netfilterqueue.pyx
 setup.py
diff --git a/README.rst b/README.rst
@@ -32,16 +32,16 @@ From PyPI
 
 To install from PyPI by pip::
 
-    pip install netfilterqueue
+    pip install NetfilterQueue
 
 From source
 -----------
 
 To install from source::
 
     wget http://pypi.python.org/packages/source/N/NetfilterQueue/NetfilterQueue-0.1.tar.gz
-    tar -xvzf netfilterqueue-0.1.tar.gz
-    cd netfilterqueue-0.1
+    tar -xvzf NetfilterQueue-0.1.tar.gz
+    cd NetfilterQueue-0.1
     python setup.py install
 
 Setup will use Cython if it is installed, regenerating the .c source from the .pyx before compiling the .so.
diff --git a/setup.py b/setup.py
@@ -5,22 +5,23 @@
 try:
     # Use Cython
     from Cython.Distutils import build_ext
+    cmd = {"build_ext": build_ext}
     ext = Extension(
             "netfilterqueue",
             sources=["netfilterqueue.pyx",],
             libraries=["netfilter_queue"],
         )
 except ImportError:
     # No Cython
-    build_ext = None
+    cmd = {}
     ext = Extension(
             "netfilterqueue",
             sources = ["netfilterqueue.c"],
             libraries=["netfilter_queue"],
         )
 
 setup(
-    cmdclass = {"build_ext": build_ext},
+    cmdclass = cmd,
     ext_modules = [ext],
     name="NetfilterQueue",
     version=VERSION,

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 *.so
 build/
 dist/
 +MANIFEST