From 05a2aa392d8afebd1d8f253da5e61fc0a0c0efed Mon Sep 17 00:00:00 2001
From: Niels de Vos <devos@fedoraproject.org>
Date: Thu, 27 Jun 2013 14:23:57 +0200
Subject: [PATCH] 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 <devos@fedoraproject.org>
+- correct trimming the ChangeLog, keep the recent messages (#963027)
+- remove the umount.glusterfs helper (#640620)
+
 * Wed Jun 26 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 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"
-