[packages/glusterfs] Version: 3.8.11
jajcus
jajcus at pld-linux.org
Fri Apr 21 16:33:52 CEST 2017
commit 5524b2b39fdcbe82cfa2c127117eacf252a23af3
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Fri Apr 21 16:33:14 2017 +0200
Version: 3.8.11
glusterfs-python.patch | 14 ++---
glusterfs.spec | 10 ++--
interpreters.patch | 153 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 164 insertions(+), 13 deletions(-)
---
diff --git a/glusterfs.spec b/glusterfs.spec
index 8793353..218a54c 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -15,17 +15,18 @@
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.8.7
+Version: 3.8.11
Release: 1
License: LGPL v3+ or GPL v2 (libraries), GPL v3+ (programs)
Group: Applications/System
Source0: http://download.gluster.org/pub/gluster/glusterfs/3.8/LATEST/glusterfs-%{version}.tar.gz
-# Source0-md5: 10be82c9d9492b092e41dabbe966a52e
+# Source0-md5: 1a9cc4feb1c09bce36f5b095cae64807
Source1: glusterfsd.init
Patch0: %{name}-link.patch
Patch1: %{name}-noquiet.patch
Patch2: %{name}-python.patch
Patch3: systemd.patch
+Patch4: interpreters.patch
URL: http://www.gluster.org/
BuildRequires: acl-devel
BuildRequires: autoconf >= 2.50
@@ -50,6 +51,7 @@ BuildRequires: python-devel >= 1:2.4
BuildRequires: readline-devel
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.228
+BuildRequires: sed >= 4.0
BuildRequires: sqlite3-devel >= 3
%{?with_systemtap:BuildRequires: systemtap-sdt-devel}
BuildRequires: userspace-rcu-devel >= 0.8
@@ -233,6 +235,7 @@ Plik składni Vima do edycji konfiguracji GlusterFS-a.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%{__libtoolize}
@@ -462,9 +465,6 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_var}/lib/glusterd/hooks/1/gsync-create
%dir %{_var}/lib/glusterd/hooks/1/gsync-create/post
%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/gsync-create/post/S56glusterd-geo-rep-create-post.sh
-%dir %{_var}/lib/glusterd/hooks/1/reset
-%dir %{_var}/lib/glusterd/hooks/1/reset/post
-%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/reset/post/S31ganesha-reset.sh
%dir %{_var}/lib/glusterd/hooks/1/set
%dir %{_var}/lib/glusterd/hooks/1/set/post
%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/glusterd/hooks/1/set/post/S30samba-set.sh
diff --git a/glusterfs-python.patch b/glusterfs-python.patch
index 94778ca..5f0b110 100644
--- a/glusterfs-python.patch
+++ b/glusterfs-python.patch
@@ -1,14 +1,12 @@
---- 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 @@
+diff -dur glusterfs-3.8.11.orig/configure.ac glusterfs-3.8.11/configure.ac
+--- glusterfs-3.8.11.orig/configure.ac 2017-04-21 14:47:20.000000000 +0200
++++ glusterfs-3.8.11/configure.ac 2017-04-21 14:48:27.000000000 +0200
+@@ -1150,7 +1150,7 @@
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
-
+ BUILD_PYTHON_SITE_PACKAGES=${pythondir}
+ BUILD_PYTHON_INC=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_inc())" 2>/dev/null`
diff --git a/interpreters.patch b/interpreters.patch
new file mode 100644
index 0000000..7154ebf
--- /dev/null
+++ b/interpreters.patch
@@ -0,0 +1,153 @@
+diff -dur glusterfs-3.8.11.orig/extras/ganesha/scripts/generate-epoch.py glusterfs-3.8.11/extras/ganesha/scripts/generate-epoch.py
+--- glusterfs-3.8.11.orig/extras/ganesha/scripts/generate-epoch.py 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/extras/ganesha/scripts/generate-epoch.py 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com>
+ # This file is part of GlusterFS.
+diff -dur glusterfs-3.8.11.orig/extras/geo-rep/schedule_georep.py.in glusterfs-3.8.11/extras/geo-rep/schedule_georep.py.in
+--- glusterfs-3.8.11.orig/extras/geo-rep/schedule_georep.py.in 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/extras/geo-rep/schedule_georep.py.in 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ """
+ Schedule Geo-replication
+ ------------------------
+diff -dur glusterfs-3.8.11.orig/extras/snap_scheduler/gcron.py glusterfs-3.8.11/extras/snap_scheduler/gcron.py
+--- glusterfs-3.8.11.orig/extras/snap_scheduler/gcron.py 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/extras/snap_scheduler/gcron.py 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com>
+ # This file is part of GlusterFS.
+diff -dur glusterfs-3.8.11.orig/extras/snap_scheduler/snap_scheduler.py glusterfs-3.8.11/extras/snap_scheduler/snap_scheduler.py
+--- glusterfs-3.8.11.orig/extras/snap_scheduler/snap_scheduler.py 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/extras/snap_scheduler/snap_scheduler.py 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ #
+ # Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com>
+ # This file is part of GlusterFS.
+diff -dur glusterfs-3.8.11.orig/extras/stop-all-gluster-processes.sh glusterfs-3.8.11/extras/stop-all-gluster-processes.sh
+--- glusterfs-3.8.11.orig/extras/stop-all-gluster-processes.sh 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/extras/stop-all-gluster-processes.sh 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/bash
+
+ # global
+ errors=0
+diff -dur glusterfs-3.8.11.orig/geo-replication/src/peer_mountbroker.in glusterfs-3.8.11/geo-replication/src/peer_mountbroker.in
+--- glusterfs-3.8.11.orig/geo-replication/src/peer_mountbroker.in 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/geo-replication/src/peer_mountbroker.in 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ import os
+ from argparse import ArgumentParser, RawDescriptionHelpFormatter
+ import json
+diff -dur glusterfs-3.8.11.orig/tools/gfind_missing_files/gfid_to_path.py glusterfs-3.8.11/tools/gfind_missing_files/gfid_to_path.py
+--- glusterfs-3.8.11.orig/tools/gfind_missing_files/gfid_to_path.py 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/tools/gfind_missing_files/gfid_to_path.py 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+
+ # Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com/>
+ # This file is part of GlusterFS.
+diff -dur glusterfs-3.8.11.orig/tools/glusterfind/glusterfind.in glusterfs-3.8.11/tools/glusterfind/glusterfind.in
+--- glusterfs-3.8.11.orig/tools/glusterfind/glusterfind.in 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/tools/glusterfind/glusterfind.in 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+
+ # Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com/>
+ # This file is part of GlusterFS.
+diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/brickfind.py glusterfs-3.8.11/tools/glusterfind/src/brickfind.py
+--- glusterfs-3.8.11.orig/tools/glusterfind/src/brickfind.py 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/tools/glusterfind/src/brickfind.py 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+
+ # Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com/>
+diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/changelogdata.py glusterfs-3.8.11/tools/glusterfind/src/changelogdata.py
+--- glusterfs-3.8.11.orig/tools/glusterfind/src/changelogdata.py 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/tools/glusterfind/src/changelogdata.py 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+
+ # Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com/>
+diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/changelog.py glusterfs-3.8.11/tools/glusterfind/src/changelog.py
+--- glusterfs-3.8.11.orig/tools/glusterfind/src/changelog.py 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/tools/glusterfind/src/changelog.py 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+
+ # Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com/>
+diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/conf.py glusterfs-3.8.11/tools/glusterfind/src/conf.py
+--- glusterfs-3.8.11.orig/tools/glusterfind/src/conf.py 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/tools/glusterfind/src/conf.py 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+
+ # Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com/>
+diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/__init__.py glusterfs-3.8.11/tools/glusterfind/src/__init__.py
+--- glusterfs-3.8.11.orig/tools/glusterfind/src/__init__.py 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/tools/glusterfind/src/__init__.py 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+
+ # Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com/>
+diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/libgfchangelog.py glusterfs-3.8.11/tools/glusterfind/src/libgfchangelog.py
+--- glusterfs-3.8.11.orig/tools/glusterfind/src/libgfchangelog.py 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/tools/glusterfind/src/libgfchangelog.py 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+
+ # Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com/>
+diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/main.py glusterfs-3.8.11/tools/glusterfind/src/main.py
+--- glusterfs-3.8.11.orig/tools/glusterfind/src/main.py 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/tools/glusterfind/src/main.py 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+
+ # Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com/>
+diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/nodeagent.py glusterfs-3.8.11/tools/glusterfind/src/nodeagent.py
+--- glusterfs-3.8.11.orig/tools/glusterfind/src/nodeagent.py 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/tools/glusterfind/src/nodeagent.py 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+
+ # Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com/>
+diff -dur glusterfs-3.8.11.orig/tools/glusterfind/src/utils.py glusterfs-3.8.11/tools/glusterfind/src/utils.py
+--- glusterfs-3.8.11.orig/tools/glusterfind/src/utils.py 2017-04-11 10:33:35.000000000 +0200
++++ glusterfs-3.8.11/tools/glusterfind/src/utils.py 2017-04-21 14:55:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+
+ # Copyright (c) 2015 Red Hat, Inc. <http://www.redhat.com/>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glusterfs.git/commitdiff/5524b2b39fdcbe82cfa2c127117eacf252a23af3
More information about the pld-cvs-commit
mailing list