[ovirt-node] * Sat Mar 26 2012 Mike Burns <mburns at redhat.com> 2.3.0-1 - Rebase to ovirt-node 2.3.0 upstream

mburns72h mburns72h at fedoraproject.org
Sat Mar 24 21:06:08 UTC 2012 

commit fa66faa27fb099d2dad803a4825db92409f276e3
Author: Mike Burns <mburns at redhat.com>
Date:   Sat Mar 24 17:05:35 2012 -0400

    * Sat Mar 26 2012 Mike Burns <mburns at redhat.com> 2.3.0-1
    - Rebase to ovirt-node 2.3.0 upstream

 ovirt-node.spec |  119 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 94 insertions(+), 25 deletions(-)
---
diff --git a/ovirt-node.spec b/ovirt-node.spec
index 05602d5..46fc30e 100644
--- a/ovirt-node.spec
+++ b/ovirt-node.spec
@@ -2,11 +2,11 @@
 %global product_release %{version} (0)
 %global mgmt_scripts_dir %{_sysconfdir}/node.d
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
+%define is_f16 %(test "0%{?fedora}" == "016" && echo 1 || echo 0)
 
 Summary:        The %{product_family} daemons/scripts
 Name:           ovirt-node
-Version:        2.2.3
+Version:        2.3.0
 Release:        1%{?dist}%{?extra_release}
 Source0:        %{name}-%{version}.tar.gz
 License:        GPLv2+
@@ -16,12 +16,16 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 URL:            http://www.ovirt.org/
 BuildRequires:  python-setuptools
 BuildRequires:  automake autoconf
+%if 0%{?fedora}
+BuildRequires:  systemd-units
+%endif
 
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 %if 0%{?fedora}
-BuildRequires:  systemd-units
 Requires:       systemd-units
+Requires(post):     systemd-units
+Requires(preun):    systemd-units
 #Requires:       python-augeas
 Requires:       glusterfs-client >= 2.0.1
 Requires:       anyterm
@@ -57,7 +61,7 @@ Requires:       grub
 # for applying patches in %post
 Requires:       patch
 %endif
-%if 0%{?rhel} 
+%if 0%{?rhel} && ! 0%{?centos}
 Requires:       system-release
 %endif
 
@@ -95,7 +99,6 @@ make
 make install DESTDIR=%{buildroot}
 
 # FIXME move all installs into makefile
-%{__install} -d -m0755 %{buildroot}%{_initrddir}
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/cron.hourly
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/sysconfig
@@ -106,17 +109,34 @@ make install DESTDIR=%{buildroot}
 
 %{__install} -p -m0755 scripts/node-config %{buildroot}%{_sysconfdir}/sysconfig
 
-%{__install} -p -m0755 scripts/ovirt-awake %{buildroot}%{_initrddir}
-%{__install} -p -m0755 scripts/ovirt-early %{buildroot}%{_initrddir}
-%{__install} -p -m0755 scripts/ovirt %{buildroot}%{_initrddir}
-%{__install} -p -m0755 scripts/ovirt-post %{buildroot}%{_initrddir}
-%{__install} -p -m0755 scripts/ovirt-firstboot %{buildroot}%{_initrddir}
+
+# Init stuff
+%{__install} -p -m0755 scripts/ovirt-init-functions.sh %{buildroot}%{_libexecdir}/ovirt-init-functions.sh
+
+%if 0%{?fedora}
+# Provide systemd service files
+%{__install} -d -m0755 %{buildroot}%{_unitdir}
+%{__install} -p -m0755 scripts/ovirt-awake.service %{buildroot}%{_unitdir}/ovirt-awake.service
+%{__install} -p -m0755 scripts/ovirt-early.service %{buildroot}%{_unitdir}/ovirt-early.service
+%{__install} -p -m0755 scripts/ovirt.service %{buildroot}%{_unitdir}/ovirt.service
+%{__install} -p -m0755 scripts/ovirt-post.service %{buildroot}%{_unitdir}/ovirt-post.service
+%{__install} -p -m0755 scripts/ovirt-firstboot.service %{buildroot}%{_unitdir}/ovirt-firstboot.service
+%{__install} -p -m0755 scripts/ovirt-cim.service %{buildroot}%{_unitdir}/ovirt-cim.service
+%else
+# Provide sysV scripts
+%{__install} -d -m0755 %{buildroot}%{_initrddir}
+%{__install} -p -m0755 scripts/ovirt-awake.init %{buildroot}%{_initrddir}/  ovirt-awake
+%{__install} -p -m0755 scripts/ovirt-early.init %{buildroot}%{_initrddir}/ovirt-early
+%{__install} -p -m0755 scripts/ovirt.init %{buildroot}%{_initrddir}/ovirt
+%{__install} -p -m0755 scripts/ovirt-post.init %{buildroot}%{_initrddir}/ovirt-post
+%{__install} -p -m0755 scripts/ovirt-firstboot.init %{buildroot}%{_initrddir}/ovirt-firstboot
+%{__install} -p -m0755 scripts/ovirt-cim.init %{buildroot}%{_initrddir}/ovirt-cim
+%endif
 
 %{__install} -p -m0644 logrotate/ovirt-logrotate %{buildroot}%{_sysconfdir}/cron.d
 %{__install} -p -m0644 logrotate/ovirt-logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ovirt-node
-%if 0%{?fedora}
+%if %is_f16
 # install libvirtd systemd service
-%{__install} -d -m0755 %{buildroot}%{_unitdir}
 %{__install} -p -m0644 libvirtd.service %{buildroot}%{_unitdir}
 %endif
 %if 0%{?rhel}
@@ -124,6 +144,7 @@ make install DESTDIR=%{buildroot}
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/init
 %{__install} -p -m0644 libvirtd.upstart %{buildroot}%{_sysconfdir}/init/libvirtd.conf
 %endif
+
 # load vlan module
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/sysconfig/modules
 %{__install} -p -m0755 vlan.modules %{buildroot}%{_sysconfdir}/sysconfig/modules
@@ -159,9 +180,13 @@ echo "# File where default configuration is kept" > %{buildroot}/%{_sysconfdir}/
 %if 0%{?fedora}
 %{__install} -p -m0644 scripts/collectd.py %{buildroot}%{python_sitelib}/ovirt_config_setup
 %endif
-%if 0%{?rhel}
+%if 0%{?centos}
+%{__install} -p -m0644 scripts/collectd.py %{buildroot}%{python_sitelib}/ovirt_config_setup
+%endif
+%if 0%{?rhel} && ! 0%{?centos}
 %{__install} -p -m0644 scripts/rhn.py %{buildroot}%{python_sitelib}/ovirt_config_setup
 %endif
+%{__install} -p -m0644 scripts/cim.py %{buildroot}%{python_sitelib}/ovirt_config_setup
 %{__install} -d -m0755 %{buildroot}%{python_sitelib}/ovirtnode
 %{__install} -p -m0644 scripts/__init__.py %{buildroot}%{python_sitelib}/ovirtnode
 %{__install} -p -m0644 scripts/storage.py %{buildroot}%{python_sitelib}/ovirtnode
@@ -172,36 +197,47 @@ echo "# File where default configuration is kept" > %{buildroot}/%{_sysconfdir}/
 %{__install} -p -m0644 scripts/log.py %{buildroot}%{python_sitelib}/ovirtnode
 %{__install} -p -m0644 scripts/ovirtfunctions.py %{buildroot}%{python_sitelib}/ovirtnode
 %{__install} -p -m0644 scripts/network.py %{buildroot}%{python_sitelib}/ovirtnode
+%{__install} -p -m0644 scripts/snmp.py %{buildroot}%{python_sitelib}/ovirtnode
 %{__install} -p -m0755 scripts/ovirt-config-installer.py %{buildroot}%{_libexecdir}/ovirt-config-installer
 %{__install} -p -m0755 scripts/ovirt-config-setup.py %{buildroot}%{_libexecdir}/ovirt-config-setup
 %{__install} -p -m0755 scripts/ovirt-admin-shell %{buildroot}%{_libexecdir}
-#%if 0%{?rhel}
+# python auto install
+%{__install} -p -m0755 scripts/ovirt-auto-install.py %{buildroot}%{_libexecdir}/ovirt-auto-install
 # python-augeas is not in RHEL-6
 # specific version of python-augeas is not available in Fedora yet
 %{__install} -p -m0644 scripts/augeas.py %{buildroot}%{python_sitelib}
-#%endif
 
 # ovirt-early vendor hook dir
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/ovirt-early.d
 
 # ovirt-early vendor commandline variables
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/ovirt-commandline.d
+# edit-node
+%{__install} -p -m0755 tools/edit-node %{buildroot}%{_sbindir}/edit-node
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %post
+%if 0%{?rhel}
 /sbin/chkconfig --add ovirt-awake
 /sbin/chkconfig --add ovirt-early
 /sbin/chkconfig --add ovirt-firstboot
 /sbin/chkconfig --add ovirt
 /sbin/chkconfig --add ovirt-post
+/sbin/chkconfig --add ovirt-cim
+%else
+if [ $1 -eq 1 ] ; then
+    # Initial installation
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+%endif
 # workaround for imgcreate/live.py __copy_efi_files
 if [ ! -e /boot/grub/splash.xpm.gz ]; then
   cp %{app_root}/grub-splash.xpm.gz /boot/grub/splash.xpm.gz
 fi
-%if 0%{?rhel}
+%if 0%{?rhel} && ! 0%{?centos}
 # apply dracut fixes not in rhel6
 # rhbz#683330
 # dracut.git commits rediffed for dracut-004-53.el6
@@ -221,18 +257,35 @@ rm -f /etc/system-release
 echo "%{product_family} release %{product_release}" > /etc/system-release
 
 %preun
+%if 0%{?rhel}
 if [ $1 = 0 ] ; then
     /sbin/service ovirt-early stop >/dev/null 2>&1
-    /sbin/service ovirt-firstboor stop >/dev/null 2>&1
+    /sbin/service ovirt-firstboot stop >/dev/null 2>&1
     /sbin/service ovirt stop >/dev/null 2>&1
     /sbin/service ovirt-post stop >/dev/null 2>&1
+    /sbin/service ovirt-cim stop >/dev/null 2>&1
     /sbin/chkconfig --del ovirt-awake
     /sbin/chkconfig --del ovirt-early
     /sbin/chkconfig --del ovirt-firstboot
     /sbin/chkconfig --del ovirt
     /sbin/chkconfig --del ovirt-post
+    /sbin/chkconfig --del ovirt-cim
 fi
-
+%else
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable ovirt-firstboot.service > /dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable ovirt.service > /dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable ovirt-post.service > /dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable ovirt-early.service > /dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable ovirt-cim.service > /dev/null 2>&1 || :
+
+    /bin/systemctl stop ovirt.service > /dev/null 
+    /bin/systemctl stop ovirt-post.service > /dev/null
+    /bin/systemctl stop ovirt-early.service > /dev/null
+    /bin/systemctl stop ovirt-cim.service > /dev/null
+fi
+%endif
 
 %files tools
 %defattr(0644,root,root,0755)
@@ -240,6 +293,7 @@ fi
 %{tools_root}/*.ks
 %defattr(0755,root,root,0755)
 %{_sbindir}/node-creator
+%{_sbindir}/edit-node
 
 
 %files
@@ -253,7 +307,7 @@ fi
 %{_sysconfdir}/ovirt-config-boot.d
 %config(noreplace) %{_sysconfdir}/sysconfig/node-config
 
-%if 0%{?fedora}
+%if %is_f16
 %{_unitdir}/libvirtd.service
 %endif
 %if 0%{?rhel}
@@ -278,6 +332,7 @@ fi
 %{_datadir}/dracut/modules.d/91ovirtnode/ovirt-boot-functions
 %{_datadir}/dracut/modules.d/91ovirtnode/ovirt-cleanup.sh
 %{_sysconfdir}/dracut.conf.d/ovirt-dracut.conf
+%{_libexecdir}/ovirt-auto-install
 %{_libexecdir}/ovirt-config-boot
 %{_libexecdir}/ovirt-config-hostname
 %{_libexecdir}/ovirt-config-iscsi
@@ -286,7 +341,6 @@ fi
 %{_libexecdir}/ovirt-config-networking
 %{_libexecdir}/ovirt-config-password
 %{_libexecdir}/ovirt-config-rhn
-%{_libexecdir}/ovirt-config-snmp
 %{_libexecdir}/ovirt-config-storage
 %{_libexecdir}/ovirt-config-uninstall
 %{_libexecdir}/ovirt-config-view-logs
@@ -297,23 +351,38 @@ fi
 %{_libexecdir}/ovirt-config-installer
 %{_libexecdir}/ovirt-config-setup
 %{_libexecdir}/ovirt-admin-shell
+%{_libexecdir}/ovirt-init-functions.sh
 %{_sbindir}/persist
 %{_sbindir}/unpersist
 %{python_sitelib}/ovirt_config_setup
 %{python_sitelib}/ovirtnode
-#%if 0%{?rhel}
 %{python_sitelib}/augeas*
-#%endif
-
+%{_sysconfdir}/ovirt-early.d
+%{_sysconfdir}/ovirt-commandline.d
+%if 0%{?fedora}
+%{_unitdir}/ovirt.service
+%{_unitdir}/ovirt-awake.service
+%{_unitdir}/ovirt-firstboot.service
+%{_unitdir}/ovirt-post.service
+%{_unitdir}/ovirt-early.service
+%{_unitdir}/ovirt-cim.service
+%else
 %{_initrddir}/ovirt-awake
 %{_initrddir}/ovirt-early
 %{_initrddir}/ovirt-firstboot
 %{_initrddir}/ovirt
 %{_initrddir}/ovirt-post
-%{_sysconfdir}/ovirt-early.d
-%{_sysconfdir}/ovirt-commandline.d
+%{_initrddir}/ovirt-cim
+%endif
+
 
 %changelog
+* Sat Mar 26 2012 Mike Burns <mburns at redhat.com> 2.3.0-1
+- Rebase to ovirt-node 2.3.0 upstream
+
+* Wed Feb 22 2012 Mike Burns <mburns at redhat.com> 2.2.3-2
+- fix spec file to include snmp.py and ovirt-auto-install
+
 * Wed Feb 15 2012 Mike Burns <mburns at redhat.com> 2.2.3-1
 - Update to upstream version 2.2.3
 - add limited stateless support

More information about the scm-commits mailing list