New upstream release 3.1.4
* Wed Feb 01 2012 Andrew Price <anprice@redhat.com> - 3.1.4-1 - New upstream release Adds gfs2_lockgather script - Remove gfs2-cluster (commented out for now) - Remove dependency on corosynclib-devel and systemd-units - Add rawhide_transition.patch to stop gfs_controld from building
This commit is contained in:
Andrew Price
parent
db79e764dc
commit
0dd279c6df
|
|
@ -2,3 +2,4 @@
|
|||
/gfs2-utils-3.1.1.tar.gz
|
||||
/gfs2-utils-3.1.2.tar.gz
|
||||
/gfs2-utils-3.1.3.tar.gz
|
||||
/gfs2-utils-3.1.4.tar.gz
|
||||
|
|
|
|||
128
gfs2-utils.spec
128
gfs2-utils.spec
|
|
@ -1,7 +1,7 @@
|
|||
###############################################################################
|
||||
###############################################################################
|
||||
##
|
||||
## Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
|
||||
## Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved.
|
||||
##
|
||||
## This copyrighted material is made available to anyone wishing to use,
|
||||
## modify, copy, or redistribute it subject to the terms and conditions
|
||||
|
|
@ -11,8 +11,8 @@
|
|||
###############################################################################
|
||||
|
||||
Name: gfs2-utils
|
||||
Version: 3.1.3
|
||||
Release: 2%{?dist}
|
||||
Version: 3.1.4
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
Group: System Environment/Kernel
|
||||
Summary: Utilities for managing the global filesystem (GFS2)
|
||||
|
|
@ -25,13 +25,13 @@ BuildRequires: ncurses-devel
|
|||
BuildRequires: glibc-kernheaders
|
||||
BuildRequires: automake
|
||||
BuildRequires: perl
|
||||
BuildRequires: corosynclib-devel
|
||||
BuildRequires: clusterlib-devel
|
||||
BuildRequires: openaislib-devel
|
||||
#BuildRequires: corosynclib-devel
|
||||
#BuildRequires: clusterlib-devel
|
||||
#BuildRequires: openaislib-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: systemd-units
|
||||
#BuildRequires: systemd-units
|
||||
URL: https://fedorahosted.org/cluster/wiki/HomePage
|
||||
|
||||
# The source for this package was pulled from the upstream git tree.
|
||||
|
|
@ -41,11 +41,13 @@ URL: https://fedorahosted.org/cluster/wiki/HomePage
|
|||
# ./make-tarball.sh
|
||||
#
|
||||
Source0: gfs2-utils-%{version}.tar.gz
|
||||
Patch0: rawhide_transition.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
%prep
|
||||
%setup -q -n gfs2-utils
|
||||
%patch0 -p1 -b .rawhide_transition
|
||||
|
||||
%build
|
||||
./autogen.sh
|
||||
|
|
@ -69,7 +71,10 @@ 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 0644 ./gfs2/system/gfs2-cluster.service %{buildroot}%{_unitdir}/gfs2-cluster.service
|
||||
# Remove gfs_control and the gfs_controld man page (temporary)
|
||||
rm -f %{buildroot}%{_mandir}/man8/gfs_controld.8
|
||||
rm -f %{buildroot}/usr/sbin/gfs_control
|
||||
#install -D -m 0644 ./gfs2/system/gfs2-cluster.service %{buildroot}%{_unitdir}/gfs2-cluster.service
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
|
@ -80,10 +85,6 @@ The gfs2-utils package contains a number of utilities for creating,
|
|||
checking, modifying, and correcting any inconsistencies in GFS2
|
||||
filesystems.
|
||||
|
||||
This package can be used standalone for single node GFS2 filesystems,
|
||||
but for multi-node filesystems (i.e. the normal case), the gfs2-cluster
|
||||
package is required as well.
|
||||
|
||||
%post -n gfs2-utils
|
||||
/sbin/chkconfig --add gfs2
|
||||
|
||||
|
|
@ -96,67 +97,74 @@ package is required as well.
|
|||
%{_mandir}/man8/*gfs2*
|
||||
%{_mandir}/man5/*
|
||||
|
||||
%package -n gfs2-cluster
|
||||
Group: System Environment/Base
|
||||
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
|
||||
Obsoletes: cman < 3.1.0
|
||||
Obsoletes: gfs-pcmk < 3.1.0
|
||||
Provides: gfs-pcmk = %{version}
|
||||
#%package -n gfs2-cluster
|
||||
#Group: System Environment/Base
|
||||
#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
|
||||
#Obsoletes: cman < 3.1.0
|
||||
#Obsoletes: gfs-pcmk < 3.1.0
|
||||
#Provides: gfs-pcmk = %{version}
|
||||
|
||||
%description -n gfs2-cluster
|
||||
This package contains the gfs_controld daemon and associated tools
|
||||
required to use GFS2 in a cluster. Virtually every user of GFS2 will
|
||||
need to install this package.
|
||||
#%description -n gfs2-cluster
|
||||
#This package contains the gfs_controld daemon and associated tools
|
||||
#required to use GFS2 in a cluster. Virtually every user of GFS2 will
|
||||
#need to install this package.
|
||||
|
||||
%post -n gfs2-cluster
|
||||
if [ $1 -eq 1 ] ; then
|
||||
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
fi
|
||||
#%post -n gfs2-cluster
|
||||
#if [ $1 -eq 1 ] ; then
|
||||
# /bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
#fi
|
||||
|
||||
%preun -n 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
|
||||
#%preun -n 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
|
||||
#%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
|
||||
#%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 ||:
|
||||
#/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 || :
|
||||
#/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
|
||||
%{_unitdir}/gfs2-cluster.service
|
||||
%{_sbindir}/gfs_control*
|
||||
%{_mandir}/man8/gfs_control*
|
||||
#%files -n gfs2-cluster
|
||||
#%defattr(-,root,root,-)
|
||||
#%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence
|
||||
#%{_unitdir}/gfs2-cluster.service
|
||||
#%{_sbindir}/gfs_control*
|
||||
#%{_mandir}/man8/gfs_control*
|
||||
|
||||
%changelog
|
||||
* Wed Feb 01 2012 Andrew Price <anprice@redhat.com> - 3.1.4-1
|
||||
- New upstream release
|
||||
Adds gfs2_lockgather script
|
||||
- Remove gfs2-cluster (commented out for now)
|
||||
- Remove dependency on corosynclib-devel and systemd-units
|
||||
- Add rawhide_transition.patch to stop gfs_controld from building
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
diff --git a/configure.ac b/configure.ac
|
||||
index 3fe1a49..0637096 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -114,15 +114,6 @@ AC_ARG_WITH([kernel],
|
||||
|
||||
KERNEL_CPPFLAGS="-I$KERNEL_DIR/include"
|
||||
|
||||
-PKG_CHECK_MODULES([corosync],[corosync])
|
||||
-PKG_CHECK_MODULES([cpg],[libcpg])
|
||||
-PKG_CHECK_MODULES([sackpt],[libSaCkpt])
|
||||
-PKG_CHECK_MODULES([logt],[liblogthread])
|
||||
-PKG_CHECK_MODULES([ccs],[libccs])
|
||||
-PKG_CHECK_MODULES([cfg],[libcfg])
|
||||
-PKG_CHECK_MODULES([fenced],[libfenced])
|
||||
-PKG_CHECK_MODULES([dlmcontrol],[libdlmcontrol])
|
||||
-PKG_CHECK_MODULES([quorum],[libquorum])
|
||||
PKG_CHECK_MODULES([zlib],[zlib])
|
||||
|
||||
# old versions of ncurses don't ship pkg-config files
|
||||
diff --git a/group/Makefile.am b/group/Makefile.am
|
||||
index 5b7d0f8..20282f0 100644
|
||||
--- a/group/Makefile.am
|
||||
+++ b/group/Makefile.am
|
||||
@@ -1,3 +1,3 @@
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
-SUBDIRS = libgfscontrol gfs_control gfs_controld man include
|
||||
+SUBDIRS = libgfscontrol gfs_control man include
|
||||
Loading…
Reference in New Issue