diff --git a/glusterfs.spec b/glusterfs.spec index f1a694f..04c9838 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -4,7 +4,7 @@ %global _for_fedora_koji_builds 1 # uncomment and add '%' to use the prereltag for pre-releases -%global prereltag beta3 +%global prereltag beta4 # if you wish to compile an rpm without rdma support, compile like this... # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma @@ -55,7 +55,7 @@ Summary: Cluster File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.4.0 -Release: 0.7%{?prereltag:.%{prereltag}}%{?dist} +Release: 0.8%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -631,9 +631,12 @@ cd ../ufo ./autogen.sh %configure %{?_without_rdma} %{?_without_epoll} %{?_without_fusermount} %{?_without_georeplication} %{?_without_ocf} -# Remove rpath -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +# fix hardening and remove rpath in shlibs +%if ( 0%{?fedora} && 0%{?fedora} > 17 ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) +%{__sed} -i 's| \\\$compiler_flags |&\\\$LDFLAGS |' libtool +%endif +%{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|' libtool +%{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|' libtool %{__make} %{?_smp_mflags} @@ -940,7 +943,7 @@ fi %endif %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse* /sbin/mount.glusterfs -%if ( 0%{?_without_fusermount:1} ) +%if ( ! 0%{?_without_fusermount:1} ) %{_bindir}/fusermount-glusterfs %endif %if ( 0%{?rhel} && 0%{?rhel} <= 5 ) @@ -1435,6 +1438,9 @@ fi %endif %changelog +* Fri Jun 28 2013 Kaleb S. KEITHLEY - 3.4.0-0.8.beta4 +- prerelease 3.4.0beta4 for oVirt/vdsm dependencies in Fedora19 + * Thu Jun 27 2013 Niels de Vos - correct trimming the ChangeLog, keep the recent messages (#963027) - remove the umount.glusterfs helper (#640620) diff --git a/sources b/sources index bc372be..b5b8831 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -95c6c75b09ecc2aab8db1dce1b3ff26c glusterfs-3.4.0beta3.tar.gz +1ea69ab2c2f4c4f2c1dabb316aac2375 glusterfs-3.4.0beta4.tar.gz 0d2479c3cbb124fa3a6b001d0d4d5a8b swift-1.8.0.tar.gz -a48cbca2e9bf4c0a8e44a8a08707f3a4 gluster-swift-ufo-1.2beta3.tar.gz +99c0cd2326bc2ada11bbaf1accffdc60 gluster-swift-ufo-1.2beta4.tar.gz