new upstream release
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
This commit is contained in:
Fabio M. Di Nitto
parent
7f248b0d78
commit
1f99e73412
|
|
@ -1 +1,2 @@
|
|||
ocfs2-tools-1.4.3.tar.gz
|
||||
/ocfs2-tools-1.6.3.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
diff -up ocfs2-tools-1.4.3/mount.ocfs2/mount.ocfs2.c.bak ocfs2-tools-1.4.3/mount.ocfs2/mount.ocfs2.c
|
||||
--- ocfs2-tools-1.4.3/mount.ocfs2/mount.ocfs2.c.bak 2010-08-02 20:11:37.428252707 -0400
|
||||
+++ ocfs2-tools-1.4.3/mount.ocfs2/mount.ocfs2.c 2010-08-02 20:11:57.114252733 -0400
|
||||
@@ -261,7 +261,7 @@ int main(int argc, char **argv)
|
||||
char *extra = NULL;
|
||||
int dev_ro = 0;
|
||||
char *hbstr = NULL;
|
||||
- char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 1] = "";
|
||||
+ char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 1];
|
||||
ocfs2_filesys *fs = NULL;
|
||||
struct o2cb_cluster_desc cluster;
|
||||
struct o2cb_region_desc desc;
|
||||
@@ -269,6 +269,8 @@ int main(int argc, char **argv)
|
||||
int hb_started = 0;
|
||||
struct stat statbuf;
|
||||
|
||||
+ stackstr[0] = '\0';
|
||||
+
|
||||
initialize_ocfs_error_table();
|
||||
initialize_o2dl_error_table();
|
||||
initialize_o2cb_error_table();
|
||||
|
|
@ -5,24 +5,14 @@
|
|||
|
||||
Summary: Tools for managing the Ocfs2 cluster file system
|
||||
Name: ocfs2-tools
|
||||
Version: 1.4.3
|
||||
Release: 8%{?alphatag:.%{alphatag}}%{?dist}
|
||||
Version: 1.6.3
|
||||
Release: 1%{?alphatag:.%{alphatag}}%{?dist}
|
||||
License: GPLv2
|
||||
Group: System Environment/Base
|
||||
# The source for this package was pulled from upstream's git repo and manually
|
||||
# turned into a release tarball. Use the following commands to generate the
|
||||
# tarball:
|
||||
# git clone git://oss.oracle.com/git/ocfs2-tools.git ocfs2-tools-1.3.9
|
||||
# cd ocfs2-tools-1.3.9
|
||||
# git checkout -b 20080221git 22fb58d0318a2946479833bb5e2fd58864499c78
|
||||
# ./autogen.sh
|
||||
# cd ..
|
||||
# tar -czvf ocfs2-tools-1.3.9.tar.gz ocfs2-tools-1.3.9
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Source0: http://oss.oracle.com/projects/ocfs2-tools/dist/files/source/v1.6/%{name}-%{version}.tar.gz
|
||||
Patch0: minor_build_fixes.diff
|
||||
Patch1: o2cb_pcmk.diff
|
||||
Patch2: no_stonithd.diff
|
||||
Patch3: ocfs2-tools-gcc45.patch
|
||||
URL: http://oss.oracle.com/projects/ocfs2-tools/
|
||||
Requires(post): chkconfig
|
||||
Requires(preun): chkconfig
|
||||
|
|
@ -30,15 +20,15 @@ Requires(preun): initscripts
|
|||
Requires: bash, coreutils, net-tools, modutils
|
||||
Requires: e2fsprogs, chkconfig, glib2 >= 2.2.3
|
||||
Requires: redhat-lsb
|
||||
BuildRequires: e2fsprogs-devel, glib2-devel >= 2.2.3
|
||||
BuildRequires: libblkid-devel, bzip2-devel
|
||||
BuildRequires: pygtk2 >= 1.99.16, python-devel >= 2.5
|
||||
BuildRequires: ncurses-devel, readline-devel
|
||||
BuildRequires: corosynclib-devel, openaislib-devel, clusterlib-devel
|
||||
BuildRequires: cluster-glue-libs-devel, pacemaker-libs-devel
|
||||
BuildRequires: libxml2-devel
|
||||
Provides: ocfs2-tools-pcmk = %{version}
|
||||
Obsoletes: ocfs2-tools-pcmk < 1.6.3-1
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
BuildRequires: libuuid-devel, libcom_err-devel, libblkid-devel
|
||||
BuildRequires: glib2-devel >= 2.2.3, compat-readline5-devel
|
||||
BuildRequires: pygtk2 >= 1.99.16, python-devel >= 2.5, desktop-file-utils
|
||||
BuildRequires: corosynclib-devel, openaislib-devel, clusterlib-devel
|
||||
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
|
||||
%description
|
||||
Programs to manage the Ocfs2 cluster file system, including mkfs.ocfs2,
|
||||
|
|
@ -86,25 +76,14 @@ Requires: %{name} = %{version}-%{release}
|
|||
ocfs2-tools-cman contains the daemon required to use Ocfs2 with
|
||||
cman cluster manager
|
||||
|
||||
%package pcmk
|
||||
Summary: Tools for managing the Ocfs2 cluster file system (pacemaker component)
|
||||
Group: System Environment/Base
|
||||
Requires: pacemaker >= 1.0.5-1
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: dlm-pcmk
|
||||
|
||||
%description pcmk
|
||||
ocfs2-tools-pcmk contains the daemon required to use Ocfs2 with
|
||||
pacemaker cluster manager
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
export CPPFLAGS="-I%{_includedir}/readline5" LDFLAGS="-L%{_libdir}/readline5"
|
||||
%{configure} \
|
||||
%if ! %{with_console}
|
||||
--enable-ocfs2console=no \
|
||||
|
|
@ -115,33 +94,34 @@ pacemaker cluster manager
|
|||
CFLAGS="$(echo '%{optflags}')" make
|
||||
|
||||
%install
|
||||
rm -rf "$RPM_BUILD_ROOT"
|
||||
rm -rf %{buildroot}
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
|
||||
cp -f vendor/common/o2cb.init $RPM_BUILD_ROOT/%{_initrddir}/o2cb
|
||||
cp -f vendor/common/ocfs2.init $RPM_BUILD_ROOT/%{_initrddir}/ocfs2
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
|
||||
cp -f vendor/common/o2cb.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/o2cb
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d
|
||||
mkdir -p %{buildroot}/%{_initrddir}
|
||||
cp -f vendor/common/o2cb.init %{buildroot}/%{_initrddir}/o2cb
|
||||
cp -f vendor/common/ocfs2.init %{buildroot}/%{_initrddir}/ocfs2
|
||||
mkdir -p %{buildroot}/etc/sysconfig
|
||||
cp -f vendor/common/o2cb.sysconfig %{buildroot}/etc/sysconfig/o2cb
|
||||
mkdir -p %{buildroot}/etc/udev/rules.d
|
||||
cp -f vendor/common/51-ocfs2.rules \
|
||||
$RPM_BUILD_ROOT/etc/udev/rules.d/51-ocfs2.rules
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/ocfs2
|
||||
%{buildroot}/etc/udev/rules.d/51-ocfs2.rules
|
||||
mkdir -p %{buildroot}/usr/lib/ocf/resource.d/ocfs2
|
||||
cp -f vendor/common/o2cb.ocf \
|
||||
$RPM_BUILD_ROOT/usr/lib/ocf/resource.d/ocfs2/o2cb
|
||||
chmod 0755 $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/ocfs2/o2cb
|
||||
%{buildroot}/usr/lib/ocf/resource.d/ocfs2/o2cb
|
||||
chmod 0755 %{buildroot}/usr/lib/ocf/resource.d/ocfs2/o2cb
|
||||
|
||||
make DESTDIR="$RPM_BUILD_ROOT" install
|
||||
rm -f %{buildroot}/sbin/ocfs2_controld.pcmk
|
||||
|
||||
chmod 644 $RPM_BUILD_ROOT/%{_libdir}/*.a
|
||||
|
||||
%if %{with_console}
|
||||
%{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT/%{python_sitearch}/ocfs2interface', ddir='%{python_sitearch}/ocfs2interface')"
|
||||
%{__python} -c "import compileall; compileall.compile_dir('%{buildroot}/%{python_sitearch}/ocfs2interface', ddir='%{python_sitearch}/ocfs2interface')"
|
||||
# rpm autostripper needs to see these as executable
|
||||
chmod 755 $RPM_BUILD_ROOT/%{python_sitearch}/ocfs2interface/*.so
|
||||
chmod 755 %{buildroot}/%{python_sitearch}/ocfs2interface/*.so
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf "$RPM_BUILD_ROOT"
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post
|
||||
/sbin/chkconfig --add o2cb
|
||||
|
|
@ -183,6 +163,8 @@ fi
|
|||
%{_mandir}/man8/o2cb_ctl.8.gz
|
||||
%{_mandir}/man8/ocfs2_hb_ctl.8.gz
|
||||
%{_mandir}/man8/o2image.8.gz
|
||||
%dir %{_prefix}/lib/ocf/resource.d/ocfs2
|
||||
%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
|
||||
|
||||
%if %{with_console}
|
||||
%files -n ocfs2console
|
||||
|
|
@ -210,13 +192,17 @@ fi
|
|||
%defattr(-,root,root,-)
|
||||
/sbin/ocfs2_controld.cman
|
||||
|
||||
%files pcmk
|
||||
%defattr(-,root,root,-)
|
||||
/sbin/ocfs2_controld.pcmk
|
||||
%dir %{_prefix}/lib/ocf/resource.d/ocfs2
|
||||
%{_prefix}/lib/ocf/resource.d/ocfs2
|
||||
|
||||
%changelog
|
||||
* Fri Dec 3 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.6.3-1
|
||||
- new upstream release
|
||||
- drop ocfs2-tools-gcc45.patch (now upstream)
|
||||
- clean up comment sections in spec file
|
||||
- drop ocfs2-tools-pcmk package/build. -pcmk variants of other packages are gone
|
||||
- ship o2cb pcmk ras from main package
|
||||
- clear BuildRequires
|
||||
- fix linking with readline5 (rhbz: #511308)
|
||||
- update BuildRoot and usage of RPM_BUILD_ROOT
|
||||
|
||||
* Mon Aug 2 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4.3-8
|
||||
- make the patch use a character string instead of a sequence of characters
|
||||
string. gcc didn't complain but it seems like a better idea.
|
||||
|
|
|
|||
Loading…
Reference in New Issue