diff --git a/glusterfs.spec b/glusterfs.spec index 0ee2cae..f9997b2 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -51,7 +51,7 @@ # Fedora deprecated syslog, see # https://fedoraproject.org/wiki/Changes/NoDefaultSyslog # (And what about RHEL7?) -%if ( 0%{?fedora} && 0%{?fedora} >= 20 ) || ( 0%{?rhel} && 0%{?rhel} <= 6 ) +%if ( 0%{?fedora} && 0%{?fedora} >= 20 ) || ( 0%{?rhel} && 0%{?rhel} < 7 ) %global _without_syslog --disable-syslog %endif @@ -99,7 +99,7 @@ %global _without_systemtap --enable-systemtap=no # From https://fedoraproject.org/wiki/Packaging:Python#Macros -%if ( 0%{?rhel} && 0%{?rhel} <= 5 ) +%if ( 0%{?rhel} && 0%{?rhel} < 6 ) %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif @@ -168,8 +168,8 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.7.6 -Release: 2%{?prereltag:.%{prereltag}}%{?dist} +Version: 3.7.7 +Release: 1%{?prereltag:.%{prereltag}}%{?dist} Vendor: Fedora Project %else Name: @PACKAGE_NAME@ @@ -193,7 +193,7 @@ Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -%if ( 0%{?rhel} && 0%{?rhel} <= 5 ) +%if ( 0%{?rhel} && 0%{?rhel} < 6 ) BuildRequires: python-simplejson %endif %if ( 0%{_for_fedora_koji_builds} ) @@ -213,7 +213,7 @@ BuildRequires: libaio-devel libacl-devel BuildRequires: python-devel BuildRequires: python-ctypes BuildRequires: userspace-rcu-devel >= 0.7 -%if ( 0%{?rhel} && 0%{?rhel} <= 5 ) +%if ( 0%{?rhel} && 0%{?rhel} < 6 ) BuildRequires: e2fsprogs-devel %else BuildRequires: libuuid-devel @@ -560,6 +560,7 @@ Requires: %{name}-cli = %{version}-%{release} # some daemons (like quota) use a fuse-mount, glusterfsd is part of -fuse Requires: %{name}-fuse = %{version}-%{release} # self-heal daemon, rebalance, nfs-server etc. are actually clients +Requires: %{name}-api = %{version}-%{release} Requires: %{name}-client-xlators = %{version}-%{release} # psmisc for killall, lvm2 for snapshot, and nfs-utils and # and rpcbind/portmap for gnfs server @@ -608,6 +609,10 @@ This package provides the glusterfs server daemon. # For whatever reason, install-sh is sometimes missing. When this gets fixed, # there is no need to run ./autogen or have a BuildRequires for automake. [ -e 'install-sh' -o -e 'install.sh' ] || ./autogen.sh +%if ( 0%{?rhel} && 0%{?rhel} < 6 ) +CFLAGS=-DUSE_INSECURE_OPENSSL +export CFLAGS +%endif %configure \ ./autogen.sh && %configure \ %{?_with_cmocka} \ @@ -1033,8 +1038,6 @@ fi %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/stat-prefetch.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/write-behind.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system/posix-acl.so -%{_libexecdir}/glusterfs/gfind_missing_files -%{_sbindir}/gfind_missing_files %files api %exclude %{_libdir}/*.so @@ -1135,6 +1138,8 @@ fi %{_datadir}/glusterfs/scripts/generate-gfid-file.sh %{_datadir}/glusterfs/scripts/gsync-sync-gfid %ghost %attr(0644,-,-) %{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf +%{_libexecdir}/glusterfs/gfind_missing_files +%{_sbindir}/gfind_missing_files %endif %files libs @@ -1285,9 +1290,12 @@ fi %endif %changelog +* Mon Feb 1 2016 Kaleb S. KEITHLEY - 3.7.7-1 +- GlusterFS 3.7.7 GA + * Mon Nov 9 2015 Kaleb S. KEITHLEY - 3.7.6-2 - glusterfs-server Requires: glusterfs-api -- s/%define/%global/ +- s/%%define/%%global/ * Mon Nov 9 2015 Kaleb S. KEITHLEY - 3.7.6-1 - GlusterFS 3.7.6 GA diff --git a/sources b/sources index 1031a69..2955c3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af8df703e4e6b44f8baa1fe6a9d81f5c glusterfs-3.7.6.tar.gz +fcde32df66a78249d389fc90e8bf2f68 glusterfs-3.7.7.tar.gz