rpms/smolt/FC-6 smolt.spec,1.18,1.19

[Jeffrey C. Ollie (jcollie)]

Author: jcollie

Update of /cvs/extras/rpms/smolt/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8377

Modified Files:
	smolt.spec 
Log Message:
Add standard scriptlets in pre & post to handle init script - fixes #236776


Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/FC-6/smolt.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- smolt.spec	13 Apr 2007 19:10:42 -0000	1.18
+++ smolt.spec	17 Apr 2007 18:02:14 -0000	1.19
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
 Version: 0.9.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -17,6 +17,11 @@
 BuildRequires: gettext
 BuildRequires: /usr/bin/msgfmt.py
 
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
+
 %description
 The Fedora hardware profiler is a server-client system that does a hardware
 scan against a machine and sends the results to a public Fedora Project
@@ -54,8 +59,6 @@
 %build
 cd client/
 make
-# Remove the po files
-find ./ -name smolt.po -exec rm {} \;
 
 %install
 %{__rm} -rf %{buildroot}
@@ -72,6 +75,7 @@
 %{__mv} client/smolt-init %{buildroot}/%{_initrddir}/smolt
 %{__mv} client/smolt.cron.monthly %{buildroot}/%{_sysconfdir}/cron.d/smolt
 %{__cp} -adv client/po/* %{buildroot}/%{_datadir}/locale/
+find %{buildroot} -name \*.po\* -delete
 
 touch %{buildroot}/%{_sysconfdir}/sysconfig/hw-uuid
 
@@ -90,10 +94,13 @@
 %{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/smoltGui.py
 %{__chmod} +x %{buildroot}/%{_initrddir}/smolt
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
 %post
+/sbin/chkconfig --add smolt
 if ! [ -f %{_sysconfdir}/sysconfig/hw-uuid ]
 then
     /bin/cat /proc/sys/kernel/random/uuid > %{_sysconfdir}/sysconfig/hw-uuid
@@ -101,15 +108,18 @@
     /bin/chown root:root %{_sysconfdir}/sysconfig/hw-uuid
 fi
 
-#%find_lang %{name}
+%preun
+if [ $1 = 0 ]; then
+        /sbin/service smolt stop >/dev/null 2>&1
+        /sbin/chkconfig --del smolt
+fi
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README GPL doc/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/client
 %{_datadir}/%{name}/doc
-%{_datadir}/locale/
 %{_bindir}/%{name}*
 %{_sysconfdir}/cron.d/%{name}
 %{_initrddir}/%{name}
@@ -124,6 +134,10 @@
 %{_datadir}/firstboot/modules/smolt.py*
 
 %changelog
+* Tue Apr 17 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.9.6-4
+- Add standard scriptlets in pre & post to handle init script - fixes #236776
+- Use the find_lang macro to find/mark translations.
+
 * Fri Apr 13 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.9.6-3
 - Put a copy of the privacy policy where the client is expecting it.