forked from pool/ocfs2-tools
Accepting request 162496 from network:ha-clustering:Factory
- Add _service file to automatically pull from git. It can be invoked locally by "osc service disabledrun" - Use spec-cleaner - No need to call ldconfig without shared objects - Drop unneeded %clean section - No need to export CFLAGS, %configure does that. - Also provide ocfs2-support to have clean upgrade path - Drop patches (merged upstream): + fix-pacemaker-libs.patch + support-for-xvd-devices.patch (forwarded request 162089 from saschpe) OBS-URL: https://build.opensuse.org/request/show/162496 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocfs2-tools?expand=0&rev=47
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
ebbe24404d
18
_service
Normal file
18
_service
Normal file
@ -0,0 +1,18 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="url">git://oss.oracle.com/git/ocfs2-tools.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="versionformat">1.8.2+git.%ct.%h</param>
|
||||
<param name="revision">master</param>
|
||||
</service>
|
||||
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">ocfs2*.tar</param>
|
||||
<param name="compression">gz</param>
|
||||
</service>
|
||||
|
||||
<service name="set_version" mode="disabled">
|
||||
<param name="basename">ocfs2</param>
|
||||
</service>
|
||||
</services>
|
||||
3
ocfs2-tools-1.8.2+git.1361836695.ff84eb5.tar.gz
Normal file
3
ocfs2-tools-1.8.2+git.1361836695.ff84eb5.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:50591c0264e1317ac516d23d671cbc521f4d17e85ef42ab3f300add7f84ddd37
|
||||
size 1543758
|
||||
@ -1,3 +1,33 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 2 09:47:35 UTC 2013 - speilicke@suse.com
|
||||
|
||||
- Add _service file to automatically pull from git. It can be invoked
|
||||
locally by "osc service disabledrun"
|
||||
- Use spec-cleaner
|
||||
- No need to call ldconfig without shared objects
|
||||
- Drop unneeded %clean section
|
||||
- No need to export CFLAGS, %configure does that.
|
||||
- Also provide ocfs2-support to have clean upgrade path
|
||||
- Drop patches (merged upstream):
|
||||
+ fix-pacemaker-libs.patch
|
||||
+ support-for-xvd-devices.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 21 15:00:46 CDT 2013 - rgoldwyn@suse.com
|
||||
|
||||
- Reverted tarball to v1.8.2
|
||||
- Added support-for-xvd-devices.patch: Support for xvd devices
|
||||
- Fixed a couple of rpmlint errors
|
||||
- libdlm requirement
|
||||
- devel package grouping changed
|
||||
- restore-g_list_append.patch is not required for old tarball
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 19 02:54:02 CDT 2013 - rgoldwyn@suse.com
|
||||
|
||||
- Update ocfs2-tools.tar.bz2 to latest upstream for upstream fixes
|
||||
- restore-g_list_append.patch: Fix o2cb node listing
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 25 18:47:16 UTC 2012 - coolo@suse.com
|
||||
|
||||
|
||||
138
ocfs2-tools.spec
138
ocfs2-tools.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package ocfs2-tools
|
||||
#
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,27 +17,13 @@
|
||||
|
||||
|
||||
Name: ocfs2-tools
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: e2fsprogs-devel
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: libaio-devel
|
||||
BuildRequires: libbz2-devel
|
||||
BuildRequires: libcorosync-devel
|
||||
BuildRequires: libdlm-devel
|
||||
BuildRequires: libopenais-devel
|
||||
BuildRequires: libpacemaker-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python-gtk-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: update-desktop-files
|
||||
Version: 1.8.2+git.1361836695.ff84eb5
|
||||
Release: 0
|
||||
Summary: Oracle Cluster File System 2 Core Tools
|
||||
License: GPL-2.0+
|
||||
Group: System/Filesystems
|
||||
Version: 1.8.2
|
||||
Release: 0
|
||||
Source: ocfs2-tools.tar.bz2
|
||||
Url: http://oss.oracle.com/projects/ocfs2-tools/
|
||||
Source: ocfs2-tools-%{version}.tar.gz
|
||||
Source1: o2cb.ocf
|
||||
Source2: reflink.tar.bz2
|
||||
Patch101: force-debug.patch
|
||||
@ -55,18 +41,33 @@ Patch206: ocfs2-tools-resource.patch
|
||||
Patch207: fix-indexed-dirs.patch
|
||||
Patch208: 0001-fswreck-Create-a-loop-in-group-chains.patch
|
||||
Patch209: 0002-Break-a-chain-loop-in-group-desc.patch
|
||||
Url: http://oss.oracle.com/projects/ocfs2-tools/
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: e2fsprogs-devel
|
||||
BuildRequires: libaio-devel
|
||||
BuildRequires: libbz2-devel
|
||||
BuildRequires: libcorosync-devel
|
||||
BuildRequires: libdlm-devel
|
||||
BuildRequires: libopenais-devel
|
||||
BuildRequires: libpacemaker-devel
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: libz1
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python-gtk-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
Requires(pre): %fillup_prereq
|
||||
Requires(pre): %insserv_prereq
|
||||
Requires: /sbin/chkconfig
|
||||
Requires: e2fsprogs
|
||||
Requires: glib2 >= 2.2.3
|
||||
Requires: modutils
|
||||
Requires: net-tools
|
||||
PreReq: %insserv_prereq %fillup_prereq
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: libdlm
|
||||
Requires: openais
|
||||
%if %suse_version < 1120
|
||||
# There's no separate kmp for openSUSE 11.2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if 0%{?suse_version} < 1120
|
||||
# There's no separate kmp for openSUSE 11.2
|
||||
Recommends: ocfs2-kmp
|
||||
%endif
|
||||
|
||||
@ -79,14 +80,14 @@ managing the file system.
|
||||
%package -n ocfs2console
|
||||
Summary: Oracle Cluster Filesystem 2 GUI tools
|
||||
Group: System/Filesystems
|
||||
Obsoletes: ocfs2-support
|
||||
Requires: ocfs2-tools = %{version}
|
||||
AutoReqProv: No
|
||||
Requires: e2fsprogs
|
||||
Requires: glib2 >= 2.2.3
|
||||
Requires: ocfs2-tools = %{version}
|
||||
Requires: ocfs2-tools = %{version}
|
||||
Requires: python-gtk >= 1.99.16
|
||||
Requires: vte >= 0.11.10
|
||||
Provides: ocfs2-support = %{version}
|
||||
Obsoletes: ocfs2-support < %{version}
|
||||
|
||||
%description -n ocfs2console
|
||||
OCFS is the Oracle Cluster Filesystem.
|
||||
@ -95,7 +96,7 @@ This package contains additional tools and a GUI (python-gtk).
|
||||
|
||||
%package devel
|
||||
Summary: Oracle Cluster File System 2 Development files
|
||||
Group: System/Filesystems
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libcom_err
|
||||
Requires: libcom_err-devel
|
||||
Requires: ocfs2-tools = %{version}
|
||||
@ -118,7 +119,7 @@ This package contains the core user-space tools needed for creating and
|
||||
managing the file system.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name} -a 2
|
||||
%setup -q -a 2
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
%patch103 -p1
|
||||
@ -136,66 +137,57 @@ managing the file system.
|
||||
%patch209 -p1
|
||||
|
||||
%build
|
||||
export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
|
||||
export PROJECT="ocfs2-tools"
|
||||
autoreconf -fi -I /usr/share/aclocal
|
||||
%configure --disable-debug --prefix=/usr --mandir=%{_mandir} --enable-ocfs2console=yes --enable-dynamic-fsck=yes --enable-dynamic-ctl=yes
|
||||
make OPTS="$RPM_OPT_FLAGS"
|
||||
%configure --disable-debug --enable-ocfs2console=yes --enable-dynamic-fsck=yes --enable-dynamic-ctl=yes
|
||||
make OPTS="%{optflags}"
|
||||
|
||||
cd reflink
|
||||
%configure --prefix=/usr --mandir=%{_mandir}
|
||||
%configure
|
||||
make reflink
|
||||
cd ..
|
||||
|
||||
%install
|
||||
mkdir -p $RPM_BUILD_ROOT/sbin
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/bin
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
|
||||
mkdir -p ${RPM_BUILD_ROOT}/var/adm/fillup-templates
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/ocfs2
|
||||
cp -f vendor/common/o2cb.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/o2cb
|
||||
cp -f vendor/common/ocfs2.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ocfs2
|
||||
cp -f vendor/common/51-ocfs2.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
|
||||
cp -f $RPM_SOURCE_DIR/o2cb.ocf $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/ocfs2/o2cb
|
||||
chmod a+x $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/ocfs2/o2cb
|
||||
cp -f vendor/common/o2cb.sysconfig ${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.o2cb
|
||||
ln -sf ..%{_sysconfdir}/init.d/o2cb $RPM_BUILD_ROOT/sbin/rco2cb
|
||||
ln -sf ..%{_sysconfdir}/init.d/ocfs2 $RPM_BUILD_ROOT/sbin/rcocfs2
|
||||
make DESTDIR="$RPM_BUILD_ROOT" install
|
||||
mkdir -p %{buildroot}/sbin
|
||||
mkdir -p %{buildroot}%{_prefix}/bin
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/init.d
|
||||
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d/
|
||||
mkdir -p %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2
|
||||
cp -f vendor/common/o2cb.init %{buildroot}%{_sysconfdir}/init.d/o2cb
|
||||
cp -f vendor/common/ocfs2.init %{buildroot}%{_sysconfdir}/init.d/ocfs2
|
||||
cp -f vendor/common/51-ocfs2.rules %{buildroot}%{_sysconfdir}/udev/rules.d
|
||||
cp -f $RPM_SOURCE_DIR/o2cb.ocf %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
|
||||
chmod a+x %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
|
||||
cp -f vendor/common/o2cb.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.o2cb
|
||||
ln -sf ..%{_sysconfdir}/init.d/o2cb %{buildroot}/sbin/rco2cb
|
||||
ln -sf ..%{_sysconfdir}/init.d/ocfs2 %{buildroot}/sbin/rcocfs2
|
||||
make DESTDIR="%{buildroot}" install
|
||||
|
||||
cd reflink
|
||||
make DESTDIR="$RPM_BUILD_ROOT" install
|
||||
make DESTDIR="%{buildroot}" install
|
||||
cd ..
|
||||
|
||||
mv $RPM_BUILD_ROOT/{,/usr}/sbin/o2image
|
||||
mv $RPM_BUILD_ROOT/{,/usr}/sbin/debugfs.ocfs2
|
||||
mv $RPM_BUILD_ROOT/{,/usr}/sbin/ocfs2_controld.pcmk
|
||||
find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f
|
||||
find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f
|
||||
%{__python} -c "import compileall; compileall.compile_dir('$RPM_BUILD_ROOT/%{py_sitedir}/ocfs2interface', ddir='%{py_sitedir}/ocfs2interface')"
|
||||
|
||||
%clean
|
||||
if
|
||||
[ -n "${RPM_BUILD_ROOT}" -a "${RPM_BUILD_ROOT}" != "/" ]
|
||||
then
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
fi
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
mv %{buildroot}/{,/usr}/sbin/o2image
|
||||
mv %{buildroot}/{,/usr}/sbin/debugfs.ocfs2
|
||||
mv %{buildroot}/{,/usr}/sbin/ocfs2_controld.pcmk
|
||||
find %{buildroot} -name '*.a' -type f -print0 | xargs -0 rm -f
|
||||
find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f
|
||||
python -c "import compileall; compileall.compile_dir('%{buildroot}/%{py_sitedir}/ocfs2interface', ddir='%{py_sitedir}/ocfs2interface')"
|
||||
|
||||
%preun o2cb
|
||||
%stop_on_removal ocfs2
|
||||
%stop_on_removal o2cb
|
||||
|
||||
%postun o2cb
|
||||
/sbin/ldconfig
|
||||
%{insserv_cleanup}
|
||||
%restart_on_update ocfs2
|
||||
%restart_on_update o2cb
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING CREDITS MAINTAINERS
|
||||
%doc documentation/users_guide.txt
|
||||
%dir %{_sysconfdir}/udev
|
||||
%dir %{_sysconfdir}/udev/rules.d
|
||||
/sbin/fsck.ocfs2
|
||||
@ -227,12 +219,10 @@ fi
|
||||
%{_mandir}/man5/ocfs2.cluster.conf.5.gz
|
||||
%{_mandir}/man7/ocfs2.7.gz
|
||||
%{_mandir}/man1/o2info.1.gz
|
||||
%doc COPYING CREDITS MAINTAINERS
|
||||
%doc documentation/users_guide.txt
|
||||
%dir /usr/lib/ocf
|
||||
%dir /usr/lib/ocf/resource.d
|
||||
%dir /usr/lib/ocf/resource.d/ocfs2
|
||||
/usr/lib/ocf/resource.d/ocfs2/o2cb
|
||||
%dir %{_prefix}/lib/ocf
|
||||
%dir %{_prefix}/lib/ocf/resource.d
|
||||
%dir %{_prefix}/lib/ocf/resource.d/ocfs2
|
||||
%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
|
||||
|
||||
%files -n ocfs2console
|
||||
%defattr(-,root,root)
|
||||
@ -242,6 +232,7 @@ fi
|
||||
|
||||
%files o2cb
|
||||
%defattr(-,root,root)
|
||||
%doc README.O2CB
|
||||
/sbin/rco2cb
|
||||
/sbin/rcocfs2
|
||||
/sbin/o2cb_ctl
|
||||
@ -249,10 +240,9 @@ fi
|
||||
%{_sysconfdir}/init.d/o2cb
|
||||
%{_sysconfdir}/init.d/ocfs2
|
||||
%{_mandir}/man8/o2cb_ctl.8*
|
||||
/var/adm/fillup-templates/sysconfig.o2cb
|
||||
%{_localstatedir}/adm/fillup-templates/sysconfig.o2cb
|
||||
%{_mandir}/man7/o2cb.7.gz
|
||||
%{_mandir}/man8/o2cb.8.gz
|
||||
%doc README.O2CB
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a66c14aa2e505099784dd5f2378a6a817265dd7fb637f853abb682d60a7b5cb7
|
||||
size 1125613
|
||||
Loading…
Reference in New Issue
Block a user