From 11dc8c724bcf8f73250655e26a8e6db1549c5840 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 27 Jun 2013 14:23:57 +0200 Subject: [PATCH 1/2] Correct ChangeLog, remove umount.glusterfs --- glusterfs.spec | 32 +++++++++++++++++--------------- umount.glusterfs | 4 ---- 2 files changed, 17 insertions(+), 19 deletions(-) delete mode 100644 umount.glusterfs diff --git a/glusterfs.spec b/glusterfs.spec index f7d7668..f1a694f 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -74,11 +74,10 @@ Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz %endif Source1: glusterd.sysconfig Source2: glusterfsd.sysconfig -Source3: umount.glusterfs -Source4: glusterfs-fuse.logrotate -Source5: glusterd.logrotate -Source6: glusterfsd.logrotate -Source7: rhel5-load-fuse-modules +Source3: glusterfs-fuse.logrotate +Source4: glusterd.logrotate +Source5: glusterfsd.logrotate +Source6: rhel5-load-fuse-modules Patch0: %{name}-3.2.5.configure.ac.patch Patch1: %{name}-3.3.0.libglusterfs.Makefile.patch Patch2: %{name}-3.3.1.rpc.rpcxprt.rdma.name.c.patch @@ -701,7 +700,12 @@ find %{buildroot}%{_libdir} -name '*.la' -delete # Remove installed docs, they're included by %%doc %{__rm} -rf %{buildroot}%{_datadir}/doc/glusterfs/ -tail -50 ChangeLog > ChangeLog.tail && mv ChangeLog.tail ChangeLog +head -50 ChangeLog > ChangeLog.head && mv ChangeLog.head ChangeLog +cat << EOM >> ChangeLog + +More commit messages for this ChangeLog can be found at +https://forge.gluster.org/glusterfs-core/glusterfs/commits/v%{version}%{?prereltag} +EOM # Remove benchmarking and other unpackaged files %{__rm} -rf %{buildroot}/benchmarking @@ -722,18 +726,15 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha %endif %if ( 0%{_for_fedora_koji_builds} ) -# Install wrapper umount script -%{__install} -D -p -m 0755 %{SOURCE3} \ - %{buildroot}/sbin/umount.glusterfs # Client logrotate entry -%{__install} -D -p -m 0644 %{SOURCE4} \ +%{__install} -D -p -m 0644 %{SOURCE3} \ %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs-fuse # Server logrotate entry -%{__install} -D -p -m 0644 %{SOURCE5} \ +%{__install} -D -p -m 0644 %{SOURCE4} \ %{buildroot}%{_sysconfdir}/logrotate.d/glusterd # Legacy server logrotate entry -%{__install} -D -p -m 0644 %{SOURCE6} \ +%{__install} -D -p -m 0644 %{SOURCE5} \ %{buildroot}%{_sysconfdir}/logrotate.d/glusterfsd %else %{__install} -D -p -m 0644 extras/glusterfs-logrotate \ @@ -939,9 +940,6 @@ fi %endif %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse* /sbin/mount.glusterfs -%if ( 0%{_for_fedora_koji_builds} ) -/sbin/umount.glusterfs -%endif %if ( 0%{?_without_fusermount:1} ) %{_bindir}/fusermount-glusterfs %endif @@ -1437,6 +1435,10 @@ fi %endif %changelog +* Thu Jun 27 2013 Niels de Vos +- correct trimming the ChangeLog, keep the recent messages (#963027) +- remove the umount.glusterfs helper (#640620) + * Wed Jun 26 2013 Kaleb S. KEITHLEY - 3.4.0-0.7.beta3 - prerelease 3.4.0beta3 for oVirt/vdsm dependencies in Fedora19 - libgfapi and xlator/mount/api dependency fix diff --git a/umount.glusterfs b/umount.glusterfs deleted file mode 100644 index 9aefa5f..0000000 --- a/umount.glusterfs +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -umount "$1" - From 2ad0eed616f7e6251bedeffa5d648565915d216b Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 28 Jun 2013 11:21:39 -0400 Subject: [PATCH 2/2] glusterfs-3.4.0-0.8beta4 --- glusterfs.spec | 18 ++++++++++++------ sources | 4 ++-- 2 files changed, 14 insertions(+), 8 deletions(-) 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