Merge pull request #1459 from ertugerata/master

fix

programming/language/python/python-pyblock/files/fix-underlinking.patch

@@ -1,8 +1,15 @@
-diff --git a/Makefile b/Makefile
-index 1b40530..dfaf3f7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,12 +12,12 @@ VERSION := $(shell awk '/Version:/ { print $$2 }' python-pyblock.spec)
+diff -Nuar pyblock-0.53.orig/Makefile pyblock-0.53/Makefile
+--- pyblock-0.53.orig/Makefile	2016-03-30 09:41:42.510926755 +0300
++++ pyblock-0.53/Makefile	2016-03-30 09:42:32.328924813 +0300
+@@ -5,19 +5,19 @@
+ DEBUGLIB := "/usr/lib/debug"
+ CC := gcc
+ PYVER := $(shell python -c "import sys; print sys.version[0:3]")
+-CFLAGS := -g -I/usr/include/python$(PYVER) -Wall -Werror -fPIC $(OPTFLAGS) -fno-strict-aliasing
++CFLAGS := -g -I/usr/include/python$(PYVER) -Wall -fPIC $(OPTFLAGS) -fno-strict-aliasing
+ LDFLAGS := -shared
+ 
+ VERSION := $(shell awk '/Version:/ { print $$2 }' python-pyblock.spec)
  RELEASE := $(shell awk -F '[ %]' '/Release:/ { print $$2 }' python-pyblock.spec)
  USESELINUX = 1
  

programming/language/python/python-pyblock/fix-underlinking.patch

@@ -1,26 +0,0 @@
-diff -Nuar pyblock-0.53.orig/Makefile pyblock-0.53/Makefile
---- pyblock-0.53.orig/Makefile	2016-03-30 09:41:42.510926755 +0300
-+++ pyblock-0.53/Makefile	2016-03-30 09:42:32.328924813 +0300
-@@ -5,19 +5,19 @@
- DEBUGLIB := "/usr/lib/debug"
- CC := gcc
- PYVER := $(shell python -c "import sys; print sys.version[0:3]")
--CFLAGS := -g -I/usr/include/python$(PYVER) -Wall -Werror -fPIC $(OPTFLAGS) -fno-strict-aliasing
-+CFLAGS := -g -I/usr/include/python$(PYVER) -Wall -fPIC $(OPTFLAGS) -fno-strict-aliasing
- LDFLAGS := -shared
- 
- VERSION := $(shell awk '/Version:/ { print $$2 }' python-pyblock.spec)
- RELEASE := $(shell awk -F '[ %]' '/Release:/ { print $$2 }' python-pyblock.spec)
- USESELINUX = 1
- 
--dm_LIBS = dmraid devmapper
-+dm_LIBS = devmapper python2.7
- ifeq (1, $(USESELINUX))
- dm_LIBS += selinux
- CFLAGS += -DUSESELINUX=1
- endif
--dmraid_LIBS = dmraid devmapper
-+dmraid_LIBS = dmraid python2.7
- 
- PYFILES=__init__.py maps.py device.py
- LIBS = dmmodule.so dmraidmodule.so

programming/language/python/python-sphinx/pspec.xml

@@ -18,6 +18,7 @@
             <Dependency>docutils</Dependency>
             <Dependency>python-Pygments</Dependency>
             <Dependency>python-Jinja2</Dependency>
+            <Dependency>python-MarkupSafe</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch level="1">remove_docutils.patch</Patch>