Ovirt devel - Jul 2009 - [PATCH ovirt-node] Removed subpackages, stateful, stateless, logos, and selinux for inclusuion in Fedora

rhbz#:51422
---
 ovirt-node.spec.in |  149 +++++++++------------------------------------------
 1 files changed, 27 insertions(+), 122 deletions(-)

diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index 3138011..b4e660d 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -43,76 +43,23 @@ Requires:       nc
 Requires:       grub
 Requires:       /usr/sbin/crond
 Requires:       anyterm
-ExclusiveArch:  %{ix86} x86_64
-
-%define app_root %{_datadir}/%{name}
-
-%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.
-
-%package stateful
-Summary:        oVirt Node for running on Fedora Hosts
-Group:          Applications/System
-Requires:       %{name} = %{version}-%{release}
-Conflicts:      %{name}-stateless
-ExclusiveArch:  %{ix86} x86_64
-
-%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.
-
-%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
+# selunx-stuff
 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
+ExclusiveArch:  %{ix86} x86_64
+
+%define app_root %{_datadir}/%{name}
+
+%description
+Provides a series of daemons and support utilities to allow an
+oVirt Node to interact with the oVirt Server.  This package 
+should only be installed on the  oVirt Node machine. 
 
 %prep
 %setup -q
@@ -196,24 +143,6 @@ cd -
 
 /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
 
-# 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
-# end i386 bits
-mkdir -p %{buildroot}/usr/lib/anaconda-runtime
-install -p -m 644 images/syslinux-vesa-splash.jpg
%{buildroot}/usr/lib/anaconda-runtime
-# ovirt-logos
-
-# release files
-echo "%{product_family} release %{version}%{?beta: %{beta}}
(%{release})" > %{buildroot}/etc/ovirt-release
-cp %{buildroot}/etc/ovirt-release %{buildroot}/etc/issue
-echo "Kernel \r on an \m (\l)" >> %{buildroot}/etc/issue
-cp %{buildroot}/etc/issue %{buildroot}/etc/issue.net
-echo >> %{buildroot}/etc/issue
-ln -s ovirt-release %{buildroot}/etc/redhat-release
-ln -s ovirt-release %{buildroot}/etc/system-release
-
 # ovirt-config-boot post-install hooks
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/ovirt-config-boot.d
 
@@ -229,6 +158,13 @@ ln -s ovirt-release %{buildroot}/etc/system-release
 %{__ln_s} ../..%{_sbindir}/ovirt-config-boot-wrapper
%{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"98_Local install and
reboot"
 %{__ln_s} ../..%{_sbindir}/ovirt-config-uninstall
%{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"99_Uninstall node"
 
+# ovirt-logos
+# should be ifarch i386
+mkdir -p %{buildroot}%{app_root}/images
+install -p -m 644 images/grub-splash.xpm.gz
%{buildroot}%{app_root}/images/splash.xpm.gz
+# end i386 bits
+install -p -m 644 images/syslinux-vesa-splash.jpg
%{buildroot}%{app_root}/images/
+# ovirt-logos
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -236,8 +172,6 @@ ln -s ovirt-release %{buildroot}/etc/system-release
 %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
@@ -246,55 +180,27 @@ sed '/<Plugin network>/,/<\/Plugin>/d'
/etc/collectd.conf.in > /etc/collectd.con
 # /etc/chkconfig.d/collectd file, and then have to re-define collectd here
 /sbin/chkconfig --add collectd
 
-%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
-fi
-
-%post stateful
-/sbin/chkconfig --add collectd
-
-%preun stateful
-
-%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 
 %defattr(-,root,root)
 %attr(0644,root,root) /etc/ovirt-release
-/etc/redhat-release
-/etc/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
 
-%files logos
-%defattr(-, root, root)
+#logos
 %doc COPYING
 # should be ifarch i386
-/boot/grub/splash.xpm.gz
+%{app_root}/images/splash.xpm.gz
 # end i386 bits
-/usr/lib/anaconda-runtime/*.jpg
+%{app_root}/images/*.jpg
 
-%files stateless
+# selinux-stuff
 %defattr(-,root,root,0755)
+%doc SELinux/*
+%{_datadir}/selinux/*/%{modulename}.pp
+
 %{_sbindir}/ovirt-awake
 %{_sbindir}/ovirt-config-boot
 %{_sbindir}/ovirt-config-boot-wrapper
@@ -323,13 +229,9 @@ fi
 %{_sysconfdir}/ovirt-config-boot.d
 %{_sysconfdir}/ovirt-config-setup.d
 
-%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)
@@ -339,6 +241,9 @@ fi
 %config %attr(0644,root,root) %{_sysconfdir}/default/ovirt
 
 %changelog
+* Thu Jun 23 2009 David Huff <dhuff at redhat.com> - 0.97
+- Removed subpackages, stateful, stateless, logos, and selinux for inclusuion
in Fedora
+
 * 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.0.6

David Huff wrote:
> rhbz#:51422
bug 514221
https://bugzilla.redhat.com/show_bug.cgi?id=514221
> ---
>  ovirt-node.spec.in |  149
+++++++++------------------------------------------
>  1 files changed, 27 insertions(+), 122 deletions(-)
> 
> diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
> index 3138011..b4e660d 100644
> --- a/ovirt-node.spec.in
> +++ b/ovirt-node.spec.in
> @@ -43,76 +43,23 @@ Requires:       nc
>  Requires:       grub
>  Requires:       /usr/sbin/crond
>  Requires:       anyterm
> -ExclusiveArch:  %{ix86} x86_64
> -
> -%define app_root %{_datadir}/%{name}
> -
> -%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.
> -
> -%package stateful
> -Summary:        oVirt Node for running on Fedora Hosts
> -Group:          Applications/System
> -Requires:       %{name} = %{version}-%{release}
> -Conflicts:      %{name}-stateless
> -ExclusiveArch:  %{ix86} x86_64
> -
> -%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.
> -
> -%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
> +# selunx-stuff
>  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
> +ExclusiveArch:  %{ix86} x86_64
> +
> +%define app_root %{_datadir}/%{name}
> +
> +%description
> +Provides a series of daemons and support utilities to allow an
> +oVirt Node to interact with the oVirt Server.  This package 
> +should only be installed on the  oVirt Node machine. 
>  
>  %prep
>  %setup -q
> @@ -196,24 +143,6 @@ cd -
>  
>  /usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
>  
> -# 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
> -# end i386 bits
> -mkdir -p %{buildroot}/usr/lib/anaconda-runtime
> -install -p -m 644 images/syslinux-vesa-splash.jpg
%{buildroot}/usr/lib/anaconda-runtime
> -# ovirt-logos
> -
> -# release files
> -echo "%{product_family} release %{version}%{?beta: %{beta}}
(%{release})" > %{buildroot}/etc/ovirt-release
> -cp %{buildroot}/etc/ovirt-release %{buildroot}/etc/issue
> -echo "Kernel \r on an \m (\l)" >> %{buildroot}/etc/issue
> -cp %{buildroot}/etc/issue %{buildroot}/etc/issue.net
> -echo >> %{buildroot}/etc/issue
> -ln -s ovirt-release %{buildroot}/etc/redhat-release
> -ln -s ovirt-release %{buildroot}/etc/system-release
> -
>  # ovirt-config-boot post-install hooks
>  %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/ovirt-config-boot.d
>  
> @@ -229,6 +158,13 @@ ln -s ovirt-release %{buildroot}/etc/system-release
>  %{__ln_s} ../..%{_sbindir}/ovirt-config-boot-wrapper
%{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"98_Local install and
reboot"
>  %{__ln_s} ../..%{_sbindir}/ovirt-config-uninstall
%{buildroot}%{_sysconfdir}/ovirt-config-setup.d/"99_Uninstall node"
>  
> +# ovirt-logos
> +# should be ifarch i386
> +mkdir -p %{buildroot}%{app_root}/images
> +install -p -m 644 images/grub-splash.xpm.gz
%{buildroot}%{app_root}/images/splash.xpm.gz
> +# end i386 bits
> +install -p -m 644 images/syslinux-vesa-splash.jpg
%{buildroot}%{app_root}/images/
> +# ovirt-logos
>  
>  %clean
>  %{__rm} -rf %{buildroot}
> @@ -236,8 +172,6 @@ ln -s ovirt-release %{buildroot}/etc/system-release
>  %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
> @@ -246,55 +180,27 @@ sed '/<Plugin
network>/,/<\/Plugin>/d' /etc/collectd.conf.in >
/etc/collectd.con
>  # /etc/chkconfig.d/collectd file, and then have to re-define collectd here
>  /sbin/chkconfig --add collectd
>  
> -%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
> -fi
> -
> -%post stateful
> -/sbin/chkconfig --add collectd
> -
> -%preun stateful
> -
> -%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 
>  %defattr(-,root,root)
>  %attr(0644,root,root) /etc/ovirt-release
> -/etc/redhat-release
> -/etc/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
>  
> -%files logos
> -%defattr(-, root, root)
> +#logos
>  %doc COPYING
>  # should be ifarch i386
> -/boot/grub/splash.xpm.gz
> +%{app_root}/images/splash.xpm.gz
>  # end i386 bits
> -/usr/lib/anaconda-runtime/*.jpg
> +%{app_root}/images/*.jpg
>  
> -%files stateless
> +# selinux-stuff
>  %defattr(-,root,root,0755)
> +%doc SELinux/*
> +%{_datadir}/selinux/*/%{modulename}.pp
> +
>  %{_sbindir}/ovirt-awake
>  %{_sbindir}/ovirt-config-boot
>  %{_sbindir}/ovirt-config-boot-wrapper
> @@ -323,13 +229,9 @@ fi
>  %{_sysconfdir}/ovirt-config-boot.d
>  %{_sysconfdir}/ovirt-config-setup.d
>  
> -%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)
> @@ -339,6 +241,9 @@ fi
>  %config %attr(0644,root,root) %{_sysconfdir}/default/ovirt
>  
>  %changelog
> +* Thu Jun 23 2009 David Huff <dhuff at redhat.com> - 0.97
> +- Removed subpackages, stateful, stateless, logos, and selinux for
inclusuion in Fedora
> +
>  * 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