Accepting request 386292 from home:wanghaisu:branches:network:ha-clustering:Factory
bsc#972886, add pkg-config as build requirement to ensure udev's rules directory will be detected at build time. OBS-URL: https://build.opensuse.org/request/show/386292 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=23
This commit is contained in:
parent
0d6d9ab1ea
commit
bed23fd59c
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Apr 8 13:04:00 UTC 2016 - lchiquitto@suse.de
|
||||||
|
|
||||||
|
- bsc#972886, add pkg-config as build requirement to ensure udev's
|
||||||
|
rules directory will be detected at build time
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Mar 14 08:01:22 UTC 2016 - nwang@suse.com
|
Mon Mar 14 08:01:22 UTC 2016 - nwang@suse.com
|
||||||
|
|
||||||
|
@ -57,6 +57,7 @@ BuildRequires: gcc
|
|||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
BuildRequires: libxslt
|
BuildRequires: libxslt
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
|
BuildRequires: pkg-config
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
BuildRequires: udev
|
BuildRequires: udev
|
||||||
Provides: drbd-control
|
Provides: drbd-control
|
||||||
@ -112,12 +113,6 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/drbd
|
|||||||
rm -rf %{buildroot}%{_sysconfdir}/xen
|
rm -rf %{buildroot}%{_sysconfdir}/xen
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
mkdir -p %{buildroot}/usr/lib/udev/rules.d
|
|
||||||
if [ -f "%{buildroot}/lib/udev/rules.d/65-drbd.rules" ]
|
|
||||||
then
|
|
||||||
mv %{buildroot}/lib/udev/rules.d/65-drbd.rules* %{buildroot}/usr/lib/udev/rules.d/65-drbd.rules
|
|
||||||
fi
|
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
%service_add_pre drbd.service
|
%service_add_pre drbd.service
|
||||||
|
|
||||||
@ -153,9 +148,7 @@ fi
|
|||||||
%{_sysconfdir}/xen/scripts/block-drbd
|
%{_sysconfdir}/xen/scripts/block-drbd
|
||||||
%endif
|
%endif
|
||||||
%{_prefix}/lib/ocf/resource.d/linbit/drbd
|
%{_prefix}/lib/ocf/resource.d/linbit/drbd
|
||||||
%dir /usr/lib/udev
|
%{_udevrulesdir}/65-drbd.rules
|
||||||
%dir /usr/lib/udev/rules.d
|
|
||||||
/usr/lib/udev/rules.d/65-drbd.rules
|
|
||||||
%{_unitdir}/drbd.service
|
%{_unitdir}/drbd.service
|
||||||
/usr/lib/systemd/system/drbd.service
|
/usr/lib/systemd/system/drbd.service
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
|
Loading…
Reference in New Issue
Block a user