SPECS: ovirt-managed-node.spec - (some) cosmetics

glen glen at pld-linux.org
Sat Dec 27 16:59:10 CET 2008


Author: glen                         Date: Sat Dec 27 15:59:10 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- (some) cosmetics

---- Files affected:
SPECS:
   ovirt-managed-node.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/ovirt-managed-node.spec
diff -u SPECS/ovirt-managed-node.spec:1.1 SPECS/ovirt-managed-node.spec:1.2
--- SPECS/ovirt-managed-node.spec:1.1	Wed Sep 24 17:41:51 2008
+++ SPECS/ovirt-managed-node.spec	Sat Dec 27 16:59:04 2008
@@ -15,7 +15,7 @@
 Requires(preun):	/sbin/chkconfig
 Requires:	hal
 Requires:	libvirt
-ExclusiveArch:	%{ix86} x86_64
+ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define app_root %{_datadir}/%{name}
@@ -25,7 +25,6 @@
 managed node to interact with the oVirt server.
 
 %prep
-
 %setup -q
 
 %build
@@ -36,7 +35,7 @@
 install -d $RPM_BUILD_ROOT%{_sbindir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/chkconfig.d
-install -d $RPM_BUILD_ROOT%{_initrddir}
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -d $RPM_BUILD_ROOT%{app_root}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
@@ -44,10 +43,10 @@
 install -p scripts/ovirt-awake $RPM_BUILD_ROOT%{_sbindir}
 install -p ovirt-identify-node $RPM_BUILD_ROOT%{_sbindir}
 
-install -p scripts/ovirt-functions $RPM_BUILD_ROOT%{_initrddir}
-install -p scripts/ovirt-early $RPM_BUILD_ROOT%{_initrddir}
-install -p scripts/ovirt $RPM_BUILD_ROOT%{_initrddir}
-install -p scripts/ovirt-post $RPM_BUILD_ROOT%{_initrddir}
+install -p scripts/ovirt-functions $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -p scripts/ovirt-early $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -p scripts/ovirt $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -p scripts/ovirt-post $RPM_BUILD_ROOT/etc/rc.d/init.d
 
 install -p scripts/collectd $RPM_BUILD_ROOT%{_sysconfdir}/chkconfig.d
 install -p scripts/collectd.conf.in $RPM_BUILD_ROOT%{_sysconfdir}
@@ -64,36 +63,31 @@
 
 %post
 /sbin/chkconfig --add ovirt-early
-/sbin/chkconfig ovirt-early on
 /sbin/chkconfig --add ovirt
-/sbin/chkconfig ovirt on
 /sbin/chkconfig --add ovirt-post
-/sbin/chkconfig ovirt-post on
 /sbin/chkconfig --add collectd
-/sbin/chkconfig collectd on
 
 # just to get a boot warning to shut up
-touch %{_sysconfdir}/resolv.conf
+touch /etc/resolv.conf
 
 # make libvirtd listen on the external interfaces
 sed -i -e "s/^#\(LIBVIRTD_ARGS=\"--listen\"\).*/\1/" /etc/sysconfig/libvirtd
 
 # set up qemu daemon to allow outside VNC connections
-sed -i -e "s/^[[:space:]]*#[[:space:]]*\(vnc_listen = \"0.0.0.0\"\).*/\1/" \
-%{_sysconfdir}/libvirt/qemu.conf
+sed -i -e "s/^[[:space:]]*#[[:space:]]*\(vnc_listen = \"0.0.0.0\"\).*/\1/" %{_sysconfdir}/libvirt/qemu.conf
 
 # set up libvirtd to listen on TCP (for kerberos)
 sed -i -e "s/^[[:space:]]*#[[:space:]]*\(listen_tcp\)\>.*/\1 = 1/" \
     -e "s/^[[:space:]]*#[[:space:]]*\(listen_tls\)\>.*/\1 = 0/" \
-%{_sysconfdir}/libvirt/libvirtd.conf
+	%{_sysconfdir}/libvirt/libvirtd.conf
 
 # make sure we don't autostart virbr0 on libvirtd startup
 rm -f %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 
 # with the new libvirt (0.4.0), make sure we we setup gssapi in the mech_list
-if [ `egrep -c "^mech_list: gssapi" %{_sysconfdir}/sasl2/libvirt.conf` -eq 0 ]; then
-    sed -i -e "s/^\([[:space:]]*mech_list.*\)/#\1/" /etc/sasl2/libvirt.conf
-echo "mech_list: gssapi" >> %{_sysconfdir}/sasl2/libvirt.conf
+if [ `egrep -c "^mech_list: gssapi" /etc/sasl2/libvirt.conf` -eq 0 ]; then
+	%{__sed} -i -e "s/^\([[:space:]]*mech_list.*\)/#\1/" /etc/sasl2/libvirt.conf
+	echo "mech_list: gssapi" >> /etc/sasl2/libvirt.conf
 fi
 
 # remove the %{_sysconfdir}/krb5.conf file; it will be fetched on bootup
@@ -101,7 +95,7 @@
 
 g=$(printf '\33[1m\33[32m')    # similar to g=$(tput bold; tput setaf 2)
 n=$(printf '\33[m')            # similar to n=$(tput sgr0)
-cat <<EOF > %{_sysconfdir}/issue
+cat <<EOF > /etc/issue
 
            888     888 ${g}d8b$n         888
            888     888 ${g}Y8P$n         888
@@ -117,32 +111,31 @@
   Virtualization just got the ${g}Green Light$n
 
 EOF
-cp -p %{_sysconfdir}/issue %{_sysconfdir}/issue.net
+cp -pf /etc/issue{,.net}
 
 %preun
 if [ "$1" = 0 ] ; then
-  /sbin/chkconfig --del ovirt-early
-  /sbin/chkconfig --del ovirt
-  /sbin/chkconfig --del ovirt-post
+	/sbin/chkconfig --del ovirt-early
+	/sbin/chkconfig --del ovirt
+	/sbin/chkconfig --del ovirt-post
 fi
 
 %files
 %defattr(644,root,root,755)
+%doc README NEWS AUTHOR ChangeLog
 %attr(755,root,root) %{_sbindir}/ovirt-awake
 %attr(755,root,root) %{_sbindir}/ovirt-identify-node
-%{_initrddir}/ovirt-early
-%{_initrddir}/ovirt
-%{_initrddir}/ovirt-post
+%attr(754,root,root) /etc/rc.d/init.d/ovirt-early
+%attr(754,root,root) /etc/rc.d/init.d/ovirt
+%attr(754,root,root) /etc/rc.d/init.d/ovirt-post
+/etc/rc.d/init.d/ovirt-functions
 %{_sysconfdir}/kvm-ifup
 %{_sysconfdir}/dhclient-exit-hooks
-%config /etc/logrotate.d/ovirt-logrotate.conf
-%config %{_sysconfdir}/cron.hourly/ovirt-logrotate
-%defattr(-,root,root,0644)
-%{_initrddir}/ovirt-functions
 %{_sysconfdir}/collectd.conf.in
 %{_sysconfdir}/chkconfig.d/collectd
-%config %{_sysconfdir}/ovirt-release
-%doc README NEWS AUTHOR ChangeLog
+%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/ovirt-logrotate.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cron.hourly/ovirt-logrotate
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ovirt-release
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -150,6 +143,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2008/12/27 15:59:04  glen
+- (some) cosmetics
+
 Revision 1.1  2008/09/24 15:41:51  paszczus
 - initial, from redhat
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ovirt-managed-node.spec?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list