Accepting request 42070 from Base:System

Copy from Base:System/drbd based on submit request 42070 from user prusnak

OBS-URL: https://build.opensuse.org/request/show/42070
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/drbd?expand=0&rev=26
This commit is contained in:
OBS User autobuild 2010-06-28 10:17:10 +00:00 committed by Git OBS Bridge
parent 267ac243e6
commit 1e0191cb11
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 25 05:39:10 UTC 2010 - tserong@novell.com
- Include Linbit RA
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Apr 11 14:29:39 CEST 2010 - dmueller@suse.de Sun Apr 11 14:29:39 CEST 2010 - dmueller@suse.de

View File

@ -21,7 +21,7 @@ Name: drbd
BuildRequires: bison flex udev BuildRequires: bison flex udev
Summary: Distributed Replicated Block Device Summary: Distributed Replicated Block Device
Version: 8.3.7 Version: 8.3.7
Release: 1 Release: 2
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Patch1: init-script-fixes.diff Patch1: init-script-fixes.diff
Patch2: 64bit-fixes.diff Patch2: 64bit-fixes.diff
@ -66,7 +66,6 @@ make OPTFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
%install %install
%makeinstall %makeinstall
rm $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/linbit/drbd
ln -sf ../etc/init.d/drbd $RPM_BUILD_ROOT/sbin/rcdrbd ln -sf ../etc/init.d/drbd $RPM_BUILD_ROOT/sbin/rcdrbd
mkdir -p $RPM_BUILD_ROOT/var/lib/drbd mkdir -p $RPM_BUILD_ROOT/var/lib/drbd
# #
@ -121,6 +120,7 @@ rm -rf "$RPM_BUILD_ROOT"
%dir /etc/xen/scripts %dir /etc/xen/scripts
/etc/xen/scripts/block-drbd /etc/xen/scripts/block-drbd
%endif %endif
/usr/lib/ocf/resource.d/linbit/drbd
/etc/ha.d/resource.d/drbddisk /etc/ha.d/resource.d/drbddisk
/etc/ha.d/resource.d/drbdupper /etc/ha.d/resource.d/drbdupper
%dir /etc/udev %dir /etc/udev
@ -130,6 +130,9 @@ rm -rf "$RPM_BUILD_ROOT"
%defattr(-, root, root) %defattr(-, root, root)
/var/lib/drbd /var/lib/drbd
/usr/lib/drbd /usr/lib/drbd
%dir /usr/lib/ocf
%dir /usr/lib/ocf/resource.d
%dir /usr/lib/ocf/resource.d/linbit
%dir /etc/ha.d %dir /etc/ha.d
%dir /etc/ha.d/resource.d %dir /etc/ha.d/resource.d