evilissimo pushed to ovirt-guest-agent (master). "spec: Move udev files to correct location during install (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Jun 1 08:14:09 UTC 2015


From d2be2a0ad2c17cf821d1f3072426190e47f75d06 Mon Sep 17 00:00:00 2001
From: Vinzenz Feenstra <vfeenstr at redhat.com>
Date: Mon, 1 Jun 2015 10:12:09 +0200
Subject: spec: Move udev files to correct location during install

Bug-Url: https://bugzilla.redhat.com/1226699
Signed-off-by: Vinzenz Feenstra <vfeenstr at redhat.com>

diff --git a/ovirt-guest-agent.spec b/ovirt-guest-agent.spec
index 81a72ad..22133a5 100644
--- a/ovirt-guest-agent.spec
+++ b/ovirt-guest-agent.spec
@@ -1,5 +1,5 @@
 
-%global release_version 1
+%global release_version 2
 %global _moduledir /%{_lib}/security
 
 # Note this is not building any package
@@ -16,6 +16,7 @@ BuildRequires: libtool
 BuildRequires: pam-devel
 BuildRequires: python2-devel
 BuildRequires: python-pep8
+BuildRequires: udev
 %if 0%{?fedora} >= 18
 BuildRequires: systemd
 %else
@@ -118,7 +119,8 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=%{buildroot}
 cp gdm-plugin/gdm-ovirtcred.pam %{buildroot}/%{_sysconfdir}/pam.d/gdm-ovirtcred
-
+mkdir -p %{buildroot}%{_udevrulesdir}
+mv %{buildroot}%{_sysconfdir}/udev/rules.d/55-ovirt-guest-agent.rules %{buildroot}%{_udevrulesdir}/55-ovirt-guest-agent.rules
 
 %pre common
 getent group ovirtagent >/dev/null || groupadd -r -g 175 ovirtagent
@@ -190,7 +192,7 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/ovirt-locksession
 %config(noreplace) %{_sysconfdir}/pam.d/ovirt-shutdown
 %config(noreplace) %{_sysconfdir}/pam.d/ovirt-hibernate
-%config(noreplace) %attr (644,root,root) %{_sysconfdir}/udev/rules.d/55-ovirt-guest-agent.rules
+%config(noreplace) %attr (644,root,root) %{_udevrulesdir}/55-ovirt-guest-agent.rules
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.ovirt.vdsm.Credentials.conf
 %config(noreplace) %{_sysconfdir}/security/console.apps/ovirt-locksession
 %config(noreplace) %{_sysconfdir}/security/console.apps/ovirt-shutdown
@@ -229,6 +231,9 @@ fi
 %attr (755,root,root) %{_libdir}/kde4/kgreet_ovirtcred.so
 
 %changelog
+* Mon Jun 01 2015 Kalev Lember <evilissimo at redhat.com> - 1.0.10.2-2
+- Utilize _udevrulesdir macro for rules installation
+
 * Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 1.0.10.2-1.1
 - Rebuilt for GCC 5 C++11 ABI change
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ovirt-guest-agent.git/commit/?h=master&id=d2be2a0ad2c17cf821d1f3072426190e47f75d06


More information about the scm-commits mailing list