From 7bfe3eca01bd94d1f0339e42652da7c58558d55f9788f52e8d3b4e1389dce0e8 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Mon, 5 Aug 2013 15:48:49 +0000
Subject: [PATCH] - Package /lib/udev or /usr/lib/udev in guestfsd subpackage
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=218
---
libguestfs.changes | 4 ++--
libguestfs.spec | 18 ++++++++----------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/libguestfs.changes b/libguestfs.changes
index d78ccc4..fdba879 100644
--- a/libguestfs.changes
+++ b/libguestfs.changes
@@ -1,7 +1,7 @@
-------------------------------------------------------------------
-Mon Aug 5 17:16:44 CEST 2013 - ohering@suse.de
+Mon Aug 5 17:48:01 CEST 2013 - ohering@suse.de
-- Preserve permissions for /lib/udev in guestfsd subpackage
+- Package /lib/udev or /usr/lib/udev in guestfsd subpackage
-------------------------------------------------------------------
Tue Jul 30 20:57:39 CEST 2013 - ohering@suse.de
diff --git a/libguestfs.spec b/libguestfs.spec
index 76ceaa4..c716bc6 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -62,6 +62,12 @@ Version: 1.20.10
%define _configure_python --disable-python
%define _configure_ruby --disable-ruby
+# /lib/udev is a symlink in 12.3+, package the full directory
+%if %suse_version > 1220
+%define udevrulesdir /usr/lib/udev/rules.d
+%else
+%define udevrulesdir /lib/udev/rules.d
+%endif
#
%define kernel_binary %{nil}
%ifarch ia64 %ix86 x86_64
@@ -491,15 +497,7 @@ make \
# strip kills the bytecode part of ELF binaries
export NO_BRP_STRIP_DEBUG=true
%endif
-%makeinstall
-if test -d $RPM_BUILD_ROOT/lib/udev
-then
- chmod --verbose --reference=/lib/udev $RPM_BUILD_ROOT/lib/udev
-fi
-if test -d $RPM_BUILD_ROOT/usr/lib/udev
-then
- chmod --verbose --reference=/usr/lib/udev $RPM_BUILD_ROOT/usr/lib/udev
-fi
+%makeinstall udevrulesdir=%{udevrulesdir}
#remove ocaml bindings files if they are disable via rpm macro
%if !%{with ocaml_bindings}
rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml
@@ -739,7 +737,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n guestfsd
%defattr(-,root,root)
-%config(noreplace) /lib/udev/rules.d
+%config(noreplace) %{udevrulesdir}
%{_sbindir}/guestfsd
%{_mandir}/man8/*