added rpm requirements

bgaifullin · bgaifullin · commit 87b3a696094c · 2015-01-12T22:17:27.000+03:00
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,5 @@
+[bdist_rpm]
+release = 1
+build-requires = pkgconfig xmlsec1-devel libxml2-devel xmlsec1-openssl-devel
+group = Development/Libraries
+requires = python3-lxml xmlsec1 xmlsec1-openssl
diff --git a/src/xmlsec/ds.pyx b/src/xmlsec/ds.pyx
@@ -116,7 +116,7 @@ cdef class SignatureContext(object):
         """common helper used for `sign_binary` and `verify_binary`."""
 
         cdef int rv
-        cdef const_xmlSecByte* c_data = <const_xmlSecByte*>data;
+        cdef const_xmlSecByte* c_data = <const_xmlSecByte*>data
         cdef xmlSecSize c_size = <xmlSecSize>len(data)
 
         if not (algorithm.target.usage & xmlSecTransformUsageSignatureMethod):
diff --git a/src/xmlsec/enc.pyx b/src/xmlsec/enc.pyx
@@ -5,7 +5,7 @@ from lxml.includes.etreepublic cimport import_lxml__etree
 import_lxml__etree()
 
 from lxml.includes.etreepublic cimport _Document, _Element, elementFactory
-from tree cimport xmlDocCopyNode, xmlFreeNode, xmlNode, xmlDoc, xmlDocGetRootElement
+from lxml.includes.tree cimport xmlDocCopyNode, xmlFreeNode, xmlNode, xmlDoc, xmlDocGetRootElement
 
 from .enc cimport *
 from .constants import EncryptionType
@@ -100,7 +100,8 @@ cdef class EncryptionContext:
         """
 
         cdef int rv
-        cdef xmlNode *n, *nn
+        cdef xmlNode *n
+        cdef xmlNode *nn
         cdef xmlSecEncCtxPtr context = self._handle
         cdef xmlNode *c_node = template._c_node
 
@@ -183,10 +184,14 @@ cdef class EncryptionContext:
 
         cdef int rv
         cdef xmlSecEncCtxPtr context = self._handle
-        cdef bint decrypt_content = node.get("Type") == EncryptionType.CONTENT
-        cdef xmlNode *n, *nn, *c_root
+        cdef bint decrypt_content
+        cdef xmlNode *n
+        cdef xmlNode *nn
+        cdef xmlNode *c_root
         cdef xmlSecBufferPtr result
 
+        decrypt_content = node.get("Type") == EncryptionType.CONTENT
+
         # must provide sufficient context to find the decrypted node
         parent = node.getparent()
 
diff --git a/src/xmlsec/tree.pyx b/src/xmlsec/tree.pyx
@@ -6,7 +6,6 @@ from lxml.includes.etreepublic cimport import_lxml__etree
 import_lxml__etree()
 
 from lxml.includes.etreepublic cimport _ElementTree, _Element, elementFactory
-from lxml.includes.tree cimport const_xmlChar, xmlNode
 from .tree cimport *
 from .utils cimport *
 from .constants import Namespace
