From bed23fd59c92b15432bb12f8a9c1fdf9d5ec3f4570e2b6ed7f0bec5fe80fce52 Mon Sep 17 00:00:00 2001 From: nick wang Date: Fri, 8 Apr 2016 13:41:13 +0000 Subject: [PATCH] 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 --- drbd-utils.changes | 6 ++++++ drbd-utils.spec | 11 ++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drbd-utils.changes b/drbd-utils.changes index ad1bb69..b6bdfd2 100644 --- a/drbd-utils.changes +++ b/drbd-utils.changes @@ -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 diff --git a/drbd-utils.spec b/drbd-utils.spec index d0aea10..c29cf36 100644 --- a/drbd-utils.spec +++ b/drbd-utils.spec @@ -57,6 +57,7 @@ BuildRequires: gcc BuildRequires: glibc-devel BuildRequires: libxslt BuildRequires: make +BuildRequires: pkg-config BuildRequires: systemd BuildRequires: udev Provides: drbd-control @@ -112,12 +113,6 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/drbd rm -rf %{buildroot}%{_sysconfdir}/xen %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 %service_add_pre drbd.service @@ -153,9 +148,7 @@ fi %{_sysconfdir}/xen/scripts/block-drbd %endif %{_prefix}/lib/ocf/resource.d/linbit/drbd -%dir /usr/lib/udev -%dir /usr/lib/udev/rules.d -/usr/lib/udev/rules.d/65-drbd.rules +%{_udevrulesdir}/65-drbd.rules %{_unitdir}/drbd.service /usr/lib/systemd/system/drbd.service %defattr(-, root, root)