[Ovirt-devel] [PATCH 07/10] Modified spec file
David Huff
dhuff at redhat.com
Wed Oct 14 20:09:43 UTC 2009
Removed stateful, and other old subpackages
Added subpackage ovirt-node-tools
Fixed issue with logrotate file name for fedora packaging.
Fixed problem with conflicts between logos, added in approot install in ks post
---
ovirt-node.spec.in | 234 +++++++++++++++++++---------------------------------
1 files changed, 85 insertions(+), 149 deletions(-)
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index 2a6b7b6..513f095 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -11,12 +11,6 @@ Source0: %{name}-%{version}.tar.gz
License: GPLv2+
Group: Applications/System
-%define selinux_variants mls strict targeted minimum
-%define selinux_policyver %(sed -n 's,.*selinux-policy-\([^/]*\)/.*,\1,p' /usr/share/selinux/devel/policyhelp)
-%define modulename %{name}-selinux
-Source1: %{modulename}.te
-Source2: %{modulename}.fc
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
URL: http://www.ovirt.org/
Requires(post): /sbin/chkconfig
@@ -31,7 +25,8 @@ Requires: libvirt-qpid >= 0.2.14-3
Requires: hal
Requires: collectd-virt
Requires: wget
-Requires: cyrus-sasl-gssapi cyrus-sasl cyrus-sasl-lib
+Requires: cyrus-sasl-gssapi cyrus-sasl
+Requires: cyrus-sasl-lib >= 2.1.22
Requires: iscsi-initiator-utils
Requires: ntp
Requires: nfs-utils
@@ -49,9 +44,8 @@ Requires: grub
Requires: /usr/sbin/crond
Requires: anyterm
Requires: newt-python
-Requires: libuser-python
+Requires: libuser-python >= 0.56.10
Requires: dbus-python
-Requires: python-IPy
ExclusiveArch: %{ix86} x86_64
@@ -59,89 +53,31 @@ ExclusiveArch: %{ix86} x86_64
%description
Provides a series of daemons and support utilities to allow an
-oVirt Node to interact with the oVirt Server.
-
-%package stateless
-Summary: oVirt Node for running as embedded hypervisor
-Group: Applications/System
-Requires: %{name} = %{version}-%{release}
-Conflicts: %{name}-stateful
-ExclusiveArch: %{ix86} x86_64
-
-%description stateless
-Provides the oVirt Node functionality needed as part of the
-ovirt-node-image creation. This provides a stateless oVirt Node
-that runs as a livecd.
+oVirt Node to interact with the oVirt Server. This package
+should only be installed on the oVirt Node machine.
-%package stateful
-Summary: oVirt Node for running on Fedora Hosts
+%package tools
+Summary: oVirt Node tools for building and running an oVirt Node image
Group: Applications/System
-Requires: %{name} = %{version}-%{release}
-Conflicts: %{name}-stateless
-ExclusiveArch: %{ix86} x86_64
+BuildArch: noarch
+BuildRequires: pykickstart >= 1.54
+Requires: livecd-tools >= 020-2
-%description stateful
-Provides the oVirt Node functionality needed to convert an existing
-host into a Node in a stateful manner. Presently intended for use on
-the host running the oVirt Appliance.
+%define tools_root %{_datadir}/ovirt-node-tools
-%package logos
-Summary: oVirt Node Logos
-Group: System Environment/Base
-BuildArch: noarch
-Obsoletes: redhat-logos
-Provides: redhat-logos = 10.0.1-1
-Provides: system-logos = 10.0.1-1
-Conflicts: fedora-logos
-Conflicts: generic-logos
-Conflicts: fedora-logos
-Conflicts: anaconda-images <= 10
-Conflicts: redhat-artwork <= 5.0.5
-
-%description logos
-The ovirt-logos package contains various image files which can be
-used by the bootloader, anaconda, and other related tools.
-
-%package release
-Summary: %{product_family} release file
-Group: System Environment/Base
-Obsoletes: redhat-release
-Provides: redhat-release
-%description release
-%{product_family} release files.
-
-%package selinux
-Summary: SELinux policy module supporting ovirt-node
-Group: System Environment/Base
-BuildRequires: checkpolicy, selinux-policy-devel, hardlink
-%if "%{selinux_policyver}" != ""
-Requires: selinux-policy >= %{selinux_policyver}
-%endif
-Requires: %{name} = %{version}-%{release}
-Requires(post): /usr/sbin/semodule, /sbin/restorecon
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon
-
-%description selinux
-SELinux policy module supporting ovirt-node
+%description tools
+The oVirt-node-tools package provides recipe (ks files), client tools,
+documentation for building and running an oVirt Node image. This package
+is not to be installed on the oVirt-Node, however on a development machine
+to help in deployment on the node.
%prep
%setup -q
-mkdir SELinux
-cp -p %{SOURCE1} %{SOURCE2} SELinux
-
%build
%configure
make
-cd SELinux
-for selinuxvariant in %{selinux_variants}; do
- make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
- mv %{modulename}.pp %{modulename}.pp.${selinuxvariant}
- make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
-done
-cd -
-
%install
%{__rm} -rf %{buildroot}
# FIXME move installs into makefile
@@ -167,9 +103,7 @@ cd -
%{__install} -p -m0755 scripts/ovirt-config-storage %{buildroot}%{_sbindir}
%{__install} -p -m0755 scripts/ovirt-config-uninstall %{buildroot}%{_sbindir}
%{__install} -p -m0755 scripts/ovirt-process-config %{buildroot}%{_sbindir}
-%{__install} -D -m0755 scripts/ovirt-install-node-stateful %{buildroot}%{_sbindir}
%{__install} -D -m0755 scripts/ovirt-install-node-stateless %{buildroot}%{_sbindir}
-%{__install} -D -m0755 scripts/ovirt-uninstall-node-stateful %{buildroot}%{_sbindir}
%{__install} -D -m0755 scripts/ovirt-config-view-logs %{buildroot}%{_sbindir}
%{__install} -p -m0755 scripts/persist %{buildroot}%{_sbindir}
%{__install} -p -m0755 scripts/unpersist %{buildroot}%{_sbindir}
@@ -177,7 +111,7 @@ cd -
%{__install} -p -m0644 nodeadmin/__init__.py %{buildroot}%{python_sitelib}/nodeadmin
%{__install} -p -m0644 nodeadmin/configscreen.py %{buildroot}%{python_sitelib}/nodeadmin
%{__install} -p -m0644 nodeadmin/menuscreen.py %{buildroot}%{python_sitelib}/nodeadmin
-%{__install} -p -m0755 nodeadmin/utils.py %{buildroot}%{python_sitelib}/nodeadmin
+%{__install} -p -m0644 nodeadmin/utils.py %{buildroot}%{python_sitelib}/nodeadmin
%{__install} -p -m0755 nodeadmin/nodeadmin.py %{buildroot}%{python_sitelib}/nodeadmin
%{__install} -p -m0644 nodeadmin/mainmenu.py %{buildroot}%{python_sitelib}/nodeadmin
@@ -189,10 +123,10 @@ cd -
%{__install} -p -m0755 nodeadmin/undefinedomain.py %{buildroot}%{python_sitelib}/nodeadmin
%{__install} -p -m0755 nodeadmin/listdomains.py %{buildroot}%{python_sitelib}/nodeadmin
%{__install} -p -m0644 nodeadmin/domainconfig.py %{buildroot}%{python_sitelib}/nodeadmin
-
+
%{__install} -p -m0644 nodeadmin/netmenu.py %{buildroot}%{python_sitelib}/nodeadmin
%{__install} -p -m0644 nodeadmin/networkconfig.py %{buildroot}%{python_sitelib}/nodeadmin
-%{__install} -p -m0755 nodeadmin/definenet.py %{buildroot}%{python_sitelib}/nodeadmin
+%{__install} -p -m0644 nodeadmin/definenet.py %{buildroot}%{python_sitelib}/nodeadmin
%{__install} -p -m0755 nodeadmin/createnetwork.py %{buildroot}%{python_sitelib}/nodeadmin
%{__install} -p -m0755 nodeadmin/destroynetwork.py %{buildroot}%{python_sitelib}/nodeadmin
%{__install} -p -m0755 nodeadmin/undefinenetwork.py %{buildroot}%{python_sitelib}/nodeadmin
@@ -219,7 +153,7 @@ cd -
%{__install} -p -m0755 kinit/ovirt-kinit %{buildroot}%{_sysconfdir}/cron.hourly
%{__install} -p -m0644 logrotate/ovirt-logrotate %{buildroot}%{_sysconfdir}/cron.d
-%{__install} -p -m0644 logrotate/ovirt-logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d
+%{__install} -p -m0644 logrotate/ovirt-logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ovirt-node
# install the admin tools
python nodeadmin/setup.py install --root %{buildroot}
@@ -227,25 +161,15 @@ python nodeadmin/setup.py install --root %{buildroot}
echo "oVirt Node release %{version}-%{release}" > %{buildroot}%{_sysconfdir}/ovirt-release
mkdir -p %{buildroot}/%{_sysconfdir}/default
-touch %{buildroot}/%{_sysconfdir}/default/ovirt
-
-cd SELinux
-for selinuxvariant in %{selinux_variants}; do
- install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
- install -p -m 644 %{modulename}.pp.${selinuxvariant} \
- %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp
-done
-cd -
-
-/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
+echo "# File where default partitioning info is kept" > %{buildroot}/%{_sysconfdir}/default/ovirt
# ovirt-logos
# should be ifarch i386
mkdir -p %{buildroot}/boot/grub
-install -p -m 644 images/grub-splash.xpm.gz %{buildroot}/boot/grub/splash.xpm.gz
+install -p -m 644 images/grub-splash.xpm.gz %{buildroot}%{app_root}
# end i386 bits
mkdir -p %{buildroot}/usr/lib/anaconda-runtime
-install -p -m 644 images/syslinux-vesa-splash.jpg %{buildroot}/usr/lib/anaconda-runtime
+install -p -m 644 images/syslinux-vesa-splash.jpg %{buildroot}%{app_root}
# ovirt-logos
# release files
@@ -273,62 +197,78 @@ ln -s ovirt-release %{buildroot}/etc/system-release
%{__ln_s} ../..%{_sbindir}/ovirt-config-uninstall %{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"99_Uninstall node"
+# ovirt-node-tools
+%{__install} -d -m0755 %{buildroot}%{tools_root}
+%{__install} -p -m0644 recipe/*.ks %{buildroot}%{tools_root}
+%{__install} -p -m0755 tools/create-ovirt-iso-nodes %{buildroot}%{_sbindir}
+%{__install} -p -m0755 tools/edit-livecd %{buildroot}%{_sbindir}
+%{__install} -p -m0755 tools/livecd-setauth %{buildroot}%{_sbindir}
+%{__install} -p -m0755 tools/livecd-rpms %{buildroot}%{_sbindir}
+#%{__install} -p -m0755 tools/get-ovirt-node-image %{buildroot}%{_sbindir}
+#%{__install} -p -m0755 tools/generate-ovirt-node-pxe-tree %{buildroot}%{_sbindir}
+
+
%clean
%{__rm} -rf %{buildroot}
%post
# Setup basic collectd configuration
sed '/<Plugin network>/,/<\/Plugin>/d' /etc/collectd.conf.in > /etc/collectd.conf
-
-%post stateless
/sbin/chkconfig --add ovirt-early
/sbin/chkconfig --add ovirt-firstboot
/sbin/chkconfig --add ovirt
/sbin/chkconfig --add ovirt-post
-%preun stateless
-if [ "$1" = 0 ] ; then
- /sbin/chkconfig --del ovirt-early
- /sbin/chkconfig --del ovirt-firstboot
- /sbin/chkconfig --del ovirt
- /sbin/chkconfig --del ovirt-post
+%preun
+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 stop >/dev/null 2>&1
+ /sbin/service ovirt-post stop >/dev/null 2>&1
+ /sbin/chkconfig --del ovirt-early
+ /sbin/chkconfig --del ovirt-firstboot
+ /sbin/chkconfig --del ovirt
+ /sbin/chkconfig --del ovirt-post
fi
-%post selinux
-for selinuxvariant in %{selinux_variants}; do
- /usr/sbin/semodule -s ${selinuxvariant} -i \
- %{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp &> /dev/null || :
-done
-
-%postun selinux
-if [ $1 -eq 0 ] ; then
- for selinuxvariant in %{selinux_variants}; do
- /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} &> /dev/null || :
- done
-fi
-%files release
+%files tools
+%defattr(0644,root,root,0755)
+%doc README COPYING
+%{tools_root}/*.ks
+
+%defattr(0755,root,root,0755)
+%{_sbindir}/create-ovirt-iso-nodes
+%{_sbindir}/edit-livecd
+%{_sbindir}/livecd-setauth
+%{_sbindir}/livecd-rpms
+#%{_sbindir}/get-ovirt-node-image
+#%{_sbindir}/generate-ovirt-node-pxe-tree
+
+
+%files
%defattr(-,root,root)
-%attr(0644,root,root) /etc/ovirt-release
-/etc/redhat-release
-/etc/system-release
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/ovirt-release
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/default/ovirt
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/redhat-release
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/system-release
%config(noreplace) %attr(0644,root,root) /etc/issue
%config(noreplace) %attr(0644,root,root) /etc/issue.net
-%files selinux
-%defattr(-,root,root,0755)
-%doc SELinux/*
-%{_datadir}/selinux/*/%{modulename}.pp
+%config(noreplace) %{_sysconfdir}/logrotate.d/ovirt-node
+%config(noreplace) %{_sysconfdir}/cron.d/ovirt-logrotate
+
+%{_sysconfdir}/ovirt-config-boot.d
+%{_sysconfdir}/ovirt-config-setup.d
+%config(noreplace) %{_sysconfdir}/collectd.conf.in
+%{_sysconfdir}/cron.hourly/ovirt-kinit
-%files logos
-%defattr(-, root, root)
%doc COPYING
# should be ifarch i386
-/boot/grub/splash.xpm.gz
+%{app_root}/grub-splash.xpm.gz
# end i386 bits
-/usr/lib/anaconda-runtime/*.jpg
+%{app_root}/syslinux-vesa-splash.jpg
-%files stateless
%defattr(-,root,root,0755)
%{_sbindir}/ovirt-awake
%{_sbindir}/ovirt-config-boot
@@ -348,25 +288,13 @@ fi
%{_sbindir}/showpart
%{_sbindir}/persist
%{_sbindir}/unpersist
+
%{_initrddir}/ovirt-early
%{_initrddir}/ovirt-firstboot
%{_initrddir}/ovirt
%{_initrddir}/ovirt-post
-%config %{_sysconfdir}/cron.hourly/ovirt-kinit
-%config %{_sysconfdir}/logrotate.d/ovirt-logrotate.conf
-%config %{_sysconfdir}/cron.d/ovirt-logrotate
-%{_sysconfdir}/ovirt-config-boot.d
-%{_sysconfdir}/ovirt-config-setup.d
+%attr(0644,root,root) /etc/rc.d/init.d/ovirt-functions
-%files stateful
-%defattr(-,root,root,0755)
-%{_sbindir}/ovirt-install-node-stateful
-%{_sbindir}/ovirt-uninstall-node-stateful
-
-%files
-%defattr(-,root,root,0755)
-%{_sbindir}/ovirt-awake
-%{_initrddir}/ovirt-functions
%defattr(-,root,root,0644)
%{_bindir}/nodeadmin
%{_bindir}/definedom
@@ -378,15 +306,23 @@ fi
%{_bindir}/createnet
%{_bindir}/destroynet
%{_bindir}/undefinenet
+
%{_bindir}/listnets
%{_bindir}/createuser
-%{_sysconfdir}/collectd.conf.in
+
+%defattr(-,root,root,-)
%{python_sitelib}/nodeadmin
%{python_sitelib}/nodeadmin- at VERSION@-py2.6.egg-info
-%config %attr(0644,root,root) %{_sysconfdir}/ovirt-release
-%config %attr(0644,root,root) %{_sysconfdir}/default/ovirt
+
%changelog
+* Wed Oct 07 2009 David huff <dhuff at redhat.com> - 1.0.3-4
+- Added ovirt-node-tools subpackage
+
+* Thu Jun 23 2009 David Huff <dhuff at redhat.com> - 1.0.3
+- Clean up spec for inclusion in Fedora
+- Removed subpackages, stateful, stateless, logos, and selinux
+
* Thu Dec 11 2008 Perry Myers <pmyers at redhat.com> - 0.96
- Subpackage stateful/stateless to separate out functionality for
embedded Node and Node running as part of already installed OS
--
1.6.2.5
More information about the ovirt-devel
mailing list