Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Added	ovirt-guest-agent-SLE_11_SP3.spec
@@ -0,0 +1,167 @@ + +%global release_version 1 + +Name: ovirt-guest-agent +Version: 1.0.8 +Release: %{release_version}%{?candidate_rel}%{?dist} +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 +Patch0: ovirt-guest-agent_suse-init.patch +Patch1: ovirt-guest-agent_suse-fhs.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildArch: noarch +BuildRequires: python-devel +BuildRequires: python-pep8 +%if 0%{?suse_version} +Requires: dbus-1-python +%else +Requires: dbus-python +%endif +Requires: rpm-python +Requires: python-ethtool >= 0.4-1 +Requires: udev >= 095-14.23 +Requires: kernel > 2.6.18-238.5.0 +%if 0%{!?suse_version} +Requires: usermode +%endif + +Conflicts: rhev-agent +Conflicts: rhevm-guest-agent +Conflicts: rhevm-guest-agent-common +%if 0%{?rhel} <= 6 +Conflicts: selinux-policy < 3.7.19-188 +%endif +BuildRequires: autoconf automake libtool pkgconfig sles-release +%if 0%{?suse_version} +Requires(pre): pwdutils +%else +Requires(pre): shadow-utils +%endif + +%description +This is the oVirt management agent running inside the guest. The agent +interfaces with the oVirt manager, supplying heart-beat info as well as +run-time data from within the guest itself. The agent also accepts +control commands to be run executed within the OS (like: shutdown and +restart). + +%prep +%setup -q -n ovirt-guest-agent-%{version} +%patch0 +%patch1 + +%build +autoreconf -fi +%configure \ + --includedir=%{_includedir}/security \ + --without-sso + +make %{?_smp_mflags} + +%install +make install DESTDIR=%{buildroot} + +%if 0%{?rhel} \|\| 0%{?sles_version} == 11 + # Install SystemV init script. + install -Dm 0755 ovirt-guest-agent/ovirt-guest-agent %{buildroot}%{_initrddir}/ovirt-guest-agent +%endif +%if 0%{?suse_version} + # remove consolehelper links / consolehelper not available on suse + find %{buildroot}%{_datadir}/ovirt-guest-agent -type l -exec rm {} \; +%endif + +%pre +getent group ovirtagent >/dev/null \|\| /usr/sbin/groupadd -r -g 175 ovirtagent \|\| : +getent passwd ovirtagent > /dev/null \|\| \ + /usr/sbin/useradd -u 175 -g 175 -o -r ovirtagent \ + -c "oVirt Guest Agent" -d %{_datadir}/ovirt-guest-agent -s /sbin/nologin \|\| : +exit 0 + +%post +/sbin/chkconfig --add ovirt-guest-agent \|\| : + +%posttrans +/sbin/udevadm trigger --subsystem-match="virtio-ports" \ + --attr-match="name=com.redhat.rhevm.vdsm" + +%preun +if [ "$1" -eq 0 ] +then + /sbin/service ovirt-guest-agent stop > /dev/null 2>&1 + /sbin/chkconfig --del ovirt-guest-agent + + # Send an "uninstalled" notification to vdsm. + VIRTIO=`grep "^device" %{_sysconfdir}/ovirt-guest-agent.conf \| awk '{ print $3; }'` + if [ -w $VIRTIO ] + then + # Non blocking uninstalled notification + echo -e '{"__name__": "uninstalled"}\n' \| dd of=$VIRTIO \ + oflag=nonblock status=noxfer conv=nocreat 1>& /dev/null \|\| : + fi +fi + +%postun +if [ "$1" -eq 0 ] +then + # Let udev clear access rights + /sbin/udevadm trigger --subsystem-match="virtio-ports" \ + --attr-match="name=com.redhat.rhevm.vdsm" +fi + +if [ "$1" -ge 1 ]; then + /sbin/service ovirt-guest-agent condrestart > /dev/null 2>&1 +fi + +%files +%defattr(-,root,root) +%dir %attr (755,ovirtagent,ovirtagent) %{_localstatedir}/log/ovirt-guest-agent +%dir %attr (755,root,root) %{_datadir}/ovirt-guest-agent + +%config(noreplace) %{_sysconfdir}/ovirt-guest-agent.conf + +%doc AUTHORS COPYING NEWS README + +# These are intentionally NOT 'noreplace' If this is modified by an user, +# this actually might break it. +%config(noreplace) %{_sysconfdir}/pam.d/ovirt-locksession +%config(noreplace) %{_sysconfdir}/pam.d/ovirt-shutdown +%config(noreplace) %{_sysconfdir}/pam.d/ovirt-hibernate +%dir %{_sysconfdir}/udev +%dir %{_sysconfdir}/udev/rules.d +%config(noreplace) %attr (644,root,root) %{_sysconfdir}/udev/rules.d/55-ovirt-guest-agent.rules +%dir %{_sysconfdir}/dbus-1 +%dir %{_sysconfdir}/dbus-1/system.d +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.ovirt.vdsm.Credentials.conf +%dir %{_sysconfdir}/security/console.apps +%config(noreplace) %{_sysconfdir}/security/console.apps/ovirt-locksession +%config(noreplace) %{_sysconfdir}/security/console.apps/ovirt-shutdown +%config(noreplace) %{_sysconfdir}/security/console.apps/ovirt-hibernate +%attr (755,root,root) %{_datadir}/ovirt-guest-agent/ovirt-guest-agent.py* + +%{_datadir}/ovirt-guest-agent/OVirtAgentLogic.py* +%{_datadir}/ovirt-guest-agent/VirtIoChannel.py* +%{_datadir}/ovirt-guest-agent/CredServer.py* +%{_datadir}/ovirt-guest-agent/GuestAgentLinux2.py* +%if 0%{!?suse_version} +%{_datadir}/ovirt-guest-agent/ovirt-locksession +%{_datadir}/ovirt-guest-agent/ovirt-shutdown +%{_datadir}/ovirt-guest-agent/ovirt-hibernate +%endif +%attr (755,root,root) %{_datadir}/ovirt-guest-agent/LockActiveSession.py* +%attr (755,root,root) %{_datadir}/ovirt-guest-agent/hibernate + +%attr (755,root,root) %{_initrddir}/ovirt-guest-agent + + +%changelog +* Mon Aug 12 2013 Vinzenz Feenstra <evilissimo@redhat.com> - 1.0.8-2 + - Update to final upstream version ovirt-guest-agent 1.0.8 + +* Thu Jul 11 2013 Vinzenz Feenstra <evilissimo@redhat.com> - 1.0.8-1 + - Update to version ovirt-guest-agent 1.0.8 + +* Wed Jul 10 2013 Vinzenz Feenstra <evilissimo@redhat.com> - 1.0.7-1 + - Initial ovirt-guest-agent RHEL6 package
[-] [+]	Added	ovirt-guest-agent_suse-fhs.patch ^
@@ -0,0 +1,33 @@ +--- configure.orig 2013-12-15 20:04:00.945283940 +0100 ++++ configure 2013-12-15 20:04:42.905079784 +0100 +@@ -3100,7 +3100,7 @@ + + + +- if test -f /etc/redhat-release; then ++ if [ -f /etc/redhat-release ] \|\| [ -f /etc/SuSE-release ]; then + + exec_prefix='${prefix}' + +--- m4/fhs.m4.orig 2013-12-15 20:02:10.833698120 +0100 ++++ m4/fhs.m4 2013-12-15 20:03:06.265491079 +0100 +@@ -42,6 +42,8 @@ + AC_DEFUN([DEFINE_FHS],[ + if test -f /etc/redhat-release; then + DEFINE_FHS_REDHAT ++ elif test -f /etc/SuSE-release; then ++ DEFINE_FHS_REDHAT + elif test -f /etc/debian_version; then + DEFINE_FHS_DEBIAN + fi +--- configure.ac.orig 2013-12-15 20:03:16.417491377 +0100 ++++ configure.ac 2013-12-15 20:20:56.981752152 +0100 +@@ -13,7 +13,7 @@ + DEFINE_FHS + AC_PROG_CC + AC_PROG_CXX +-AM_PROG_AR ++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + AC_PROG_LIBTOOL + AC_PROG_INSTALL + AC_PROG_MKDIR_P
[-] [+]	Added	ovirt-guest-agent_suse-init.patch ^
@@ -0,0 +1,41 @@ +--- ovirt-guest-agent/ovirt-guest-agent.in.orig 2013-12-15 19:48:58.552399781 +0100 ++++ ovirt-guest-agent/ovirt-guest-agent.in 2013-12-15 19:55:23.595154575 +0100 +@@ -8,8 +8,25 @@ + # config: /etc/ovirt-guest-agent.conf + # pidfile: /var/run/ovirt-guest-agent.pid + ++### BEGIN INIT INFO ++# Provides: ovirt-guest-agent ++# Required-Start: $syslog $remote_fs ++# Should-Start: $time ypbind smtp ++# Required-Stop: $syslog $remote_fs ++# Should-Stop: $null ++# Default-Start: 3 5 ++# Default-Stop: 0 1 2 6 ++# Short-Description: oVirt agent ++# Description: Startup/shutdown script for the oVirt agent. ++### END INIT INFO ++ + # Source function library. ++if [ -f /etc/rc.d/init.d/functions ] ; then + . /etc/rc.d/init.d/functions ++fi ++if [ -f /etc/rc.status ] ; then ++. /etc/rc.status ++fi + + agentd=/usr/share/ovirt-guest-agent/ovirt-guest-agent.py + prog=ovirt-guest-agent +@@ -36,7 +53,11 @@ + /bin/chown ovirtagent:ovirtagent ${pidfile} + [ -x /sbin/restorecon ] && /sbin/restorecon ${pidfile} + fi +- daemon --pidfile=${pidfile} --user=ovirtagent $agentd -p ${pidfile} -d $OPTIONS ++ if [ -f /etc/redhat-release ] ; then ++ daemon --pidfile=${pidfile} --user=ovirtagent $agentd -p ${pidfile} -d $OPTIONS ++ elif [ -f /etc/SuSE-release ] ; then ++ startproc -p ${pidfile} -u ovirtagent $agentd -p ${pidfile} -d $OPTIONS ++ fi + RETVAL=$? + [ $RETVAL -eq 0 ] && touch $lockfile + echo