New upstream release 3.1.3

* Thu Dec 15 2011 Andrew Price <anprice@redhat.com> - 3.1.3-1
- New upstream release
  Bugfixes and improvements to fsck.gfs2
  Fixes various other bugs
  Improve strings and translation support
- Adds gfs2-cluster systemd unit
- Removes gfs2* init scripts

Signed-off-by: Andrew Price <anprice@redhat.com>
This commit is contained in:
Andrew Price 2011-12-15 15:40:24 +00:00
parent 3d6c4c7da5
commit 3fb48d597d
3 changed files with 44 additions and 17 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/gfs2-utils-3.1.0.tar.gz
/gfs2-utils-3.1.1.tar.gz
/gfs2-utils-3.1.2.tar.gz
/gfs2-utils-3.1.3.tar.gz

View File

@ -11,7 +11,7 @@
###############################################################################
Name: gfs2-utils
Version: 3.1.2
Version: 3.1.3
Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
Group: System Environment/Kernel
@ -31,6 +31,7 @@ BuildRequires: openaislib-devel
BuildRequires: libtool
BuildRequires: zlib-devel
BuildRequires: gettext-devel
BuildRequires: systemd-units
URL: https://fedorahosted.org/cluster/wiki/HomePage
# The source for this package was pulled from the upstream git tree.
@ -68,8 +69,7 @@ rm -f %{buildroot}/usr/sbin/gfs2_tool
rm -f %{buildroot}%{_mandir}/man8/mount.gfs2.8
rm -f %{buildroot}/sbin/mount.gfs2
# End of temporary section (until mount.gfs2 removed from source)
install -D -m 0755 ./gfs2/init.d/gfs2 %{buildroot}%{_sysconfdir}/rc.d/init.d/gfs2
install -D -m 0755 ./gfs2/init.d/gfs2-cluster %{buildroot}%{_sysconfdir}/rc.d/init.d/gfs2-cluster
install -D -m 0644 ./gfs2/system/gfs2-cluster.service %{buildroot}%{_unitdir}/gfs2-cluster.service
%clean
rm -rf %{buildroot}
@ -87,17 +87,9 @@ package is required as well.
%post -n gfs2-utils
/sbin/chkconfig --add gfs2
%preun -n gfs2-utils
if [ "$1" = 0 ]; then
/sbin/service gfs2 stop >/dev/null 2>&1
/sbin/chkconfig --del gfs2
fi
exit 0
%files -n gfs2-utils
%defattr(-,root,root,-)
%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence doc/*.txt
%{_sysconfdir}/rc.d/init.d/gfs2
/sbin/*
%{_sbindir}/gfs2_*
%{_sbindir}/tunegfs2
@ -110,6 +102,12 @@ Summary: Cluster daemons for GFS2
Requires(post): chkconfig
Requires(preun): initscripts
Requires(preun): chkconfig
# SysVinit to Systemd migration bits taken from
# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
Requires(post): systemd-sysv
Requires: corosync >= 1.2.7-1
Requires: openais >= 1.1.2-1
Requires: cman >= 3.1.0-1
@ -123,22 +121,50 @@ required to use GFS2 in a cluster. Virtually every user of GFS2 will
need to install this package.
%post -n gfs2-cluster
/sbin/chkconfig --add gfs2-cluster
if [ $1 -eq 1 ] ; then
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
%preun -n gfs2-cluster
if [ "$1" = 0 ]; then
/sbin/service stop gfs2-cluster >/dev/null 2>&1
/sbin/chkconfig --del gfs2-cluster
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/bin/systemctl --no-reload disable gfs2-cluster.service > /dev/null 2>&1 || :
/bin/systemctl stop gfs2-cluster.service > /dev/null 2>&1 || :
fi
%postun -n gfs2-cluster
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/bin/systemctl try-restart gfs2-cluster.service >/dev/null 2>&1 || :
fi
%triggerun -- gfs2-cluster < 3.1.3-1
# Save the current service runlevel info
# User must manually run systemd-sysv-convert --apply httpd
# to migrate them to systemd targets
/usr/bin/systemd-sysv-convert --save gfs2-cluster >/dev/null 2>&1 ||:
# Run these because the SysV package being removed won't do them
/sbin/chkconfig --del gfs2-cluster >/dev/null 2>&1 || :
/bin/systemctl try-restart gfs2-cluster.service >/dev/null 2>&1 || :
%files -n gfs2-cluster
%defattr(-,root,root,-)
%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence
%{_sysconfdir}/rc.d/init.d/gfs2-cluster
%{_unitdir}/gfs2-cluster.service
%{_sbindir}/gfs_control*
%{_mandir}/man8/gfs_control*
%changelog
* Thu Dec 15 2011 Andrew Price <anprice@redhat.com> - 3.1.3-1
- New upstream release
Bugfixes and improvements to fsck.gfs2
Fixes various other bugs
Improve strings and translation support
- Adds gfs2-cluster systemd unit
- Removes gfs2* init scripts
* Wed Jul 06 2011 Andrew Price <anprice@redhat.com> - 3.1.2-1
- New upstream release
Fixes several bugs

View File

@ -1 +1 @@
79d6bdc903d4e14d688ffd1871a6ede0 gfs2-utils-3.1.2.tar.gz
9b385f7ddc49f18268f9b59866319e8b gfs2-utils-3.1.3.tar.gz