glusterfs-3.4.0-2, tag /var/lib/glusterd/glusterd.info as %config

This commit is contained in:
Kaleb S. KEITHLEY 2013-07-16 15:22:40 -04:00
parent 579af0d881
commit c426a212af

View File

@ -55,7 +55,7 @@ Summary: Cluster File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
Version: 3.4.0
Release: 1%{?prereltag:.%{prereltag}}%{?dist}
Release: 2%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
@ -977,6 +977,7 @@ fi
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server*
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt*
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs*
%config(noreplace) %{_sharedstatedir}/glusterd/glusterd.info
%ghost %attr(0644,-,-) %{_sharedstatedir}/glusterd/glusterd.info
%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
# This is really ugly, but I have no idea how to mark these directories in an
@ -1201,23 +1202,29 @@ fi
# to /var/lib. (N.B. Starting with 3.3.0 all gluster files are in /var/lib
# in gluster.org RPMs.) Be careful to copy them on the off chance that
# /etc and /var/lib are on separate file systems
if [ -d /etc/glusterd -a ! -h /var/lib/glusterd ]; then
%{__mkdir_p} /var/lib/glusterd
cp -a /etc/glusterd /var/lib/glusterd
if [ -d /etc/glusterd -a ! -h %{_sharedstatedir}/glusterd ]; then
%{__mkdir_p} %{_sharedstatedir}/glusterd
cp -a /etc/glusterd %{_sharedstatedir}/glusterd
rm -rf /etc/glusterd
ln -sf /var/lib/glusterd /etc/glusterd
ln -sf %{_sharedstatedir}/glusterd /etc/glusterd
fi
# Rename old volfiles in an RPM-standard way. These aren't actually
# considered package config files, so %config doesn't work for them.
if [ -d /var/lib/glusterd/vols ]; then
for file in $(find /var/lib/glusterd/vols -name '*.vol'); do
if [ -d %{_sharedstatedir}/glusterd/vols ]; then
for file in $(find %{_sharedstatedir}/glusterd/vols -name '*.vol'); do
newfile=${file}.rpmsave
echo "warning: ${file} saved as ${newfile}"
cp ${file} ${newfile}
done
fi
if [ -f %{_sharedstatedir}/glusterd/gluster.info ]; then
newfile=%{_sharedstatedir}/glusterd/gluster.info.rpmsave
echo "warning: %{_sharedstatedir}/glusterd/gluster.info saved as ${newfile}"
cp %{_sharedstatedir}/glusterd/gluster.info ${newfile}
fi
# add marker translator
# but first make certain that there are no old libs around to bite us
# BZ 834847
@ -1436,7 +1443,14 @@ fi
%endif
%changelog
* Tue Jul 16 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-2
- tag /var/lib/glusterd/glusterd.info as %config
* Tue Jul 16 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.2.2-2
- tag /var/lib/glusterd/glusterd.info as %config
* Fri Jul 12 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-1
- GlusterFS 3.4.0 GA, glusterfs-3.4.0-1
* Mon Jul 8 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-0.9.beta4
- add Obsolete: glusterfs-swift where we use openstack-swift