rpms/glusterfs
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Correct ChangeLog, remove umount.glusterfs

Browse Source
This commit is contained in:
Niels de Vos 2013-06-27 14:23:57 +02:00
parent 3b604f6837
commit 05a2aa392d
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
glusterfs.spec
View File

@ -74,11 +74,10 @@ Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
%endif %endif
Source1: glusterd.sysconfig Source1: glusterd.sysconfig
Source2: glusterfsd.sysconfig Source2: glusterfsd.sysconfig
Source3: umount.glusterfs Source3: glusterfs-fuse.logrotate
Source4: glusterfs-fuse.logrotate Source4: glusterd.logrotate
Source5: glusterd.logrotate Source5: glusterfsd.logrotate
Source6: glusterfsd.logrotate Source6: rhel5-load-fuse-modules
Source7: rhel5-load-fuse-modules
Patch0: %{name}-3.2.5.configure.ac.patch Patch0: %{name}-3.2.5.configure.ac.patch
Patch1: %{name}-3.3.0.libglusterfs.Makefile.patch Patch1: %{name}-3.3.0.libglusterfs.Makefile.patch
Patch2: %{name}-3.3.1.rpc.rpcxprt.rdma.name.c.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 # Remove installed docs, they're included by %%doc
%{__rm} -rf %{buildroot}%{_datadir}/doc/glusterfs/ %{__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 # Remove benchmarking and other unpackaged files
%{__rm} -rf %{buildroot}/benchmarking %{__rm} -rf %{buildroot}/benchmarking
@ -722,18 +726,15 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
%endif %endif
%if ( 0%{_for_fedora_koji_builds} ) %if ( 0%{_for_fedora_koji_builds} )
# Install wrapper umount script
%{__install} -D -p -m 0755 %{SOURCE3} \
%{buildroot}/sbin/umount.glusterfs
# Client logrotate entry # Client logrotate entry
%{__install} -D -p -m 0644 %{SOURCE4} \ %{__install} -D -p -m 0644 %{SOURCE3} \
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfs-fuse %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs-fuse
# Server logrotate entry # Server logrotate entry
%{__install} -D -p -m 0644 %{SOURCE5} \ %{__install} -D -p -m 0644 %{SOURCE4} \
%{buildroot}%{_sysconfdir}/logrotate.d/glusterd %{buildroot}%{_sysconfdir}/logrotate.d/glusterd
# Legacy server logrotate entry # Legacy server logrotate entry
%{__install} -D -p -m 0644 %{SOURCE6} \ %{__install} -D -p -m 0644 %{SOURCE5} \
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfsd %{buildroot}%{_sysconfdir}/logrotate.d/glusterfsd
%else %else
%{__install} -D -p -m 0644 extras/glusterfs-logrotate \ %{__install} -D -p -m 0644 extras/glusterfs-logrotate \
@ -939,9 +940,6 @@ fi
%endif %endif
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse*
/sbin/mount.glusterfs /sbin/mount.glusterfs
%if ( 0%{_for_fedora_koji_builds} )
/sbin/umount.glusterfs
%endif
%if ( 0%{?_without_fusermount:1} ) %if ( 0%{?_without_fusermount:1} )
%{_bindir}/fusermount-glusterfs %{_bindir}/fusermount-glusterfs
%endif %endif
@ -1437,6 +1435,10 @@ fi
%endif %endif
%changelog %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 * 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 - prerelease 3.4.0beta3 for oVirt/vdsm dependencies in Fedora19
- libgfapi and xlator/mount/api dependency fix - libgfapi and xlator/mount/api dependency fix

4
umount.glusterfs
View File

@ -1,4 +0,0 @@
#!/bin/sh
umount "$1"