[packages/glusterfs] - updated to 3.8.0 (3.7.x left on glusterfs-3.7 branch) - updated python patch
qboosh
qboosh at pld-linux.org
Sat Jul 30 21:03:36 CEST 2016
commit 9fb26aa3b05f486c334450ecda1e27d0e747b416
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jul 30 21:04:13 2016 +0200
- updated to 3.8.0 (3.7.x left on glusterfs-3.7 branch)
- updated python patch
glusterfs-python.patch | 23 +++++++++++++----------
glusterfs.spec | 16 +++++++++++-----
2 files changed, 24 insertions(+), 15 deletions(-)
---
diff --git a/glusterfs.spec b/glusterfs.spec
index 5c6f67e..1984fdd 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -6,6 +6,7 @@
# - package /etc/glusterfs/glusterfs-logrotate as logrotate config
# - Fix/provide working systemd service files.
# As for 3.7.11, package provided seems be non-working.
+# - configuration for firewalld? (--enable-firewalld, but checks for firewalld executable)
#
# Conditional build:
%bcond_without ibverbs # ib-verbs transport
@@ -14,12 +15,12 @@
Summary: Clustered File Storage that can scale to peta bytes
Summary(pl.UTF-8): Klastrowy system przechowywania plików skalujący się do petabajtów
Name: glusterfs
-Version: 3.7.12
+Version: 3.8.0
Release: 1
License: LGPL v3+ or GPL v2 (libraries), GPL v3+ (programs)
Group: Applications/System
-Source0: http://download.gluster.org/pub/gluster/glusterfs/3.7/LATEST/glusterfs-%{version}.tar.gz
-# Source0-md5: 1ae574a796cdb846e455f50cfe4c4622
+Source0: http://download.gluster.org/pub/gluster/glusterfs/3.8/LATEST/glusterfs-%{version}.tar.gz
+# Source0-md5: db1880ad32ef1114ce52060b266907cb
Source1: glusterfsd.init
Patch0: %{name}-link.patch
Patch1: %{name}-noquiet.patch
@@ -29,14 +30,15 @@ BuildRequires: acl-devel
BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: bison
-# cmocka >= 1.0.1 for unittest
+#BuildRequires: cmocka-devel >= 1.0.1 for unittest
+# for bd-xlator
BuildRequires: device-mapper-devel >= 2.02.79
BuildRequires: flex
BuildRequires: glib2-devel >= 2.0
BuildRequires: libaio-devel
BuildRequires: libfuse-devel >= 2.6
%{?with_ibverbs:BuildRequires: libibverbs-devel >= 1.0.4}
-%{?with_ibverbs:BuildRequires: librdmacm-devel >= 1.0.4}
+%{?with_ibverbs:BuildRequires: librdmacm-devel >= 1.0.15}
BuildRequires: libtool
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel >= 1:2.6.19
@@ -148,6 +150,7 @@ Summary(pl.UTF-8): Wtyczki transportu "verbs" InfiniBand dla GlusterFS-a
Group: Libraries
Requires: %{name}-common = %{version}-%{release}
Requires: libibverbs >= 1.0.4
+Requires: librdmacm >= 1.0.15
%description transport-ibverbs
InfiniBand "verbs" transport plugins for GlusterFS.
@@ -408,6 +411,9 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/glusterfs/api
%{_includedir}/glusterfs/gfchangelog
%{_includedir}/glusterfs/gfdb
+%{_includedir}/glusterfs/rpc
+%{_includedir}/glusterfs/server
+%{_includedir}/glusterfs/*.h
%{_pkgconfigdir}/glusterfs-api.pc
%{_pkgconfigdir}/libgfchangelog.pc
%{_pkgconfigdir}/libgfdb.pc
diff --git a/glusterfs-python.patch b/glusterfs-python.patch
index 04328e5..94778ca 100644
--- a/glusterfs-python.patch
+++ b/glusterfs-python.patch
@@ -1,11 +1,14 @@
---- glusterfs-3.7.9/configure.ac.orig 2016-03-31 21:42:00.820154766 +0200
-+++ glusterfs-3.7.9/configure.ac 2016-04-01 17:09:46.650547715 +0200
-@@ -1203,7 +1203,7 @@
- esac
+--- glusterfs-3.8.0/configure.ac.orig 2016-06-30 16:30:27.589981118 +0200
++++ glusterfs-3.8.0/configure.ac 2016-07-02 15:01:01.156248952 +0200
+@@ -1147,9 +1147,9 @@
+ PYTHONDEV_CPPFLAGS=`echo ${PYTHONDEV_CPPFLAGS} | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[[0-9]]//g'`
+
+ dnl Find python libs at user configured libdir and also "lib" under prefix
+- PYTHONDEV_LDFLAGS="${PYTHON_LIBS} -L`${PYTHON}-config --prefix`/lib -L`${PYTHON}-config --prefix`/$libdir `${PYTHON}-config --ldflags`"
++ PYTHONDEV_LDFLAGS="${PYTHON_LIBS} `${PYTHON}-config --ldflags`"
+
+- BUILD_PYTHON_SITE_PACKAGES=`$PYTHON -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix="${exec_prefix}"))'`
++ BUILD_PYTHON_SITE_PACKAGES=`$PYTHON -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix="'${prefix}'"))'`
+ BUILD_PYTHON_INC=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"`
+ BUILD_PYTHON_LIB=python$PYTHON_VERSION
- if test "x$BUILD_GLUPY" = "xyes"; then
-- BUILD_PYTHON_SITE_PACKAGES=`$PYTHON -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())'`
-+ BUILD_PYTHON_SITE_PACKAGES=`$PYTHON -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix="'$prefix'"))'`
- BUILD_PYTHON_INC=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"`
- BUILD_PYTHON_LIB=python$PYTHON_VERSION
- GLUPY_SUBDIR=glupy
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glusterfs.git/commitdiff/9fb26aa3b05f486c334450ecda1e27d0e747b416
More information about the pld-cvs-commit
mailing list