commit 7a45bd4f53f97b1117691acbcb7c2763b315305d
Author: Jakub Bogusz <[email protected]>
Date: Mon Sep 7 17:48:42 2015 +0200
- updated to 1.3.0
- updated link patch
- added python patch (fixes install with destdir)
nghttp2-link.patch | 12 ++++++------
nghttp2-python.patch | 11 +++++++++++
nghttp2.spec | 6 ++++--
3 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/nghttp2.spec b/nghttp2.spec
index 4f69d7c..8a6928d 100644
--- a/nghttp2.spec
+++ b/nghttp2.spec
@@ -7,14 +7,15 @@
Summary: HTTP/2.0 C library
Summary(pl.UTF-8): Biblioteka C HTTP/2.0
Name: nghttp2
-Version: 1.0.4
+Version: 1.3.0
Release: 1
License: MIT
Group: Libraries
#Source0Download: https://github.com/tatsuhiro-t/nghttp2/releases
Source0:
https://github.com/tatsuhiro-t/nghttp2/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 3755757c75e3e1536f8d9adeb8a649dc
+# Source0-md5: 24df3ea1d68f98f628562092fecc19af
Patch0: %{name}-link.patch
+Patch1: %{name}-python.patch
URL: https://github.com/tatsuhiro-t/nghttp2
%{?with_tests:BuildRequires: CUnit >= 2.1}
BuildRequires: autoconf >= 2.61
@@ -136,6 +137,7 @@ Statyczna biblioteka libnghttp2_asio.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%{__sed} -i -e '1s,/usr/bin/env python,%{__python},' script/fetch-ocsp-response
diff --git a/nghttp2-link.patch b/nghttp2-link.patch
index bc51463..1f81de2 100644
--- a/nghttp2-link.patch
+++ b/nghttp2-link.patch
@@ -1,10 +1,10 @@
---- nghttp2-0.7.5/src/Makefile.am.orig 2015-02-26 16:58:47.000000000 +0100
-+++ nghttp2-0.7.5/src/Makefile.am 2015-02-26 22:09:06.105022216 +0100
-@@ -189,6 +189,6 @@
+--- nghttp2-1.3.0/src/Makefile.am.orig 2015-09-06 17:57:30.052519494 +0200
++++ nghttp2-1.3.0/src/Makefile.am 2015-09-06 18:20:57.609127150 +0200
+@@ -216,6 +216,6 @@
+ ${BOOST_LDFLAGS} \
${BOOST_ASIO_LIB} \
${BOOST_THREAD_LIB} \
- ${BOOST_SYSTEM_LIB} \
-- @OPENSSL_LIBS@
-+ @OPENSSL_LIBS@ -lpthread
+- ${BOOST_SYSTEM_LIB}
++ ${BOOST_SYSTEM_LIB} -lpthread
endif # ENABLE_ASIO_LIB
diff --git a/nghttp2-python.patch b/nghttp2-python.patch
new file mode 100644
index 0000000..7a2ebdd
--- /dev/null
+++ b/nghttp2-python.patch
@@ -0,0 +1,11 @@
+--- nghttp2-1.3.0/python/Makefile.am.orig 2015-08-30 12:02:56.000000000
+0200
++++ nghttp2-1.3.0/python/Makefile.am 2015-09-06 20:09:36.208853530 +0200
+@@ -33,7 +33,7 @@
+ $(PYTHON) setup.py build
+
+ install-exec-local:
+- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
++ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
+
+ uninstall-local:
+ rm -f $(DESTDIR)$(libdir)/python*/site-packages/nghttp2.so
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nghttp2.git/commitdiff/7a45bd4f53f97b1117691acbcb7c2763b315305d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
