[ovirt-guest-agent/el5] missing file ovirt-locksession and buildroot management

Vinzenz Feenstra evilissimo at fedoraproject.org
Mon Nov 25 08:57:36 UTC 2013


commit f15447df956502f7a9c7a5687710c421deee23d4
Author: Vinzenz Feenstra <vfeenstr at redhat.com>
Date:   Mon Nov 25 09:57:05 2013 +0100

    missing file ovirt-locksession and buildroot management
    
    Signed-off-by: Vinzenz Feenstra <vfeenstr at redhat.com>

 ovirt-guest-agent.spec |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/ovirt-guest-agent.spec b/ovirt-guest-agent.spec
index cecb7fc..a1b41b1 100644
--- a/ovirt-guest-agent.spec
+++ b/ovirt-guest-agent.spec
@@ -1,8 +1,5 @@
 
-%global release_version 2
-%global candidate alpha
-%global candidate_rel .%{?candidate}
-%global candidate_file -%{?candidate}
+%global release_version 3
 
 Name: ovirt-guest-agent
 Version: 1.0.8
@@ -11,8 +8,9 @@ Summary: The oVirt Guest Agent
 Group: Applications/System
 License: ASL 2.0
 URL: http://wiki.ovirt.org/wiki/Category:Ovirt_guest_agent
-Source0: http://evilissimo.fedorapeople.org/releases/ovirt-guest-agent/%{version}/%{name}-%{version}%{candidate_file}.tar.bz2
+Source0: http://evilissimo.fedorapeople.org/releases/ovirt-guest-agent/%{version}/%{name}-%{version}.1.tar.bz2
 BuildArch: noarch
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: python2-devel
 BuildRequires: python-pep8
 Requires: dbus-python
@@ -45,18 +43,22 @@ restart).
 %configure --without-sso
 
 %install
+rm -rf %{buildroot}
 pushd .
 make -C ovirt-guest-agent -f Makefile.el5 install DESTDIR=%{buildroot}
 popd
 mkdir -p %{buildroot}%{_localstatedir}/log/ovirt-guest-agent
 mkdir -p %{buildroot}%{_localstatedir}/lock/subsys/ovirt-guest-agent
 
+install -m 644 ovirt-guest-agent/consoleapps/ovirt-locksession %{buildroot}%{_sysconfdir}/security/console.apps/ovirt-locksession
 install -m 755 ovirt-guest-agent/LockActiveSession.py %{buildroot}%{_datadir}/ovirt-guest-agent/LockActiveSession.py
-cp consoleapps/ovirt-shutdown %{buildroot}/etc/security/console.apps
 ln -sf /usr/bin/consolehelper %{buildroot}%{_datadir}/ovirt-guest-agent/ovirt-shutdown
 ln -sf /usr/bin/consolehelper %{buildroot}%{_datadir}/ovirt-guest-agent/ovirt-hibernate
 ln -sf /usr/bin/consolehelper %{buildroot}%{_datadir}/ovirt-guest-agent/ovirt-locksession
 
+%clean
+rm -rf %{buildroot}
+
 %pre
 getent group ovirtagent >/dev/null || groupadd -r -g 175 ovirtagent
 getent passwd ovirtagent > /dev/null || \


More information about the scm-commits mailing list