rpms/smolt/devel .cvsignore, 1.19, 1.20 smolt.spec, 1.43, 1.44 sources, 1.20, 1.21

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

Update of /cvs/extras/rpms/smolt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26953

Modified Files:
	.cvsignore smolt.spec sources 
Log Message:
new smolt


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	20 Nov 2007 20:48:30 -0000	1.19
+++ .cvsignore	14 Feb 2008 19:19:03 -0000	1.20
@@ -1 +1 @@
-smolt-1.0.tar.gz
+smolt-1.1.tar.gz


Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- smolt.spec	8 Jan 2008 15:54:22 -0000	1.43
+++ smolt.spec	14 Feb 2008 19:19:03 -0000	1.44
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
-Version: 1.0
-Release: 4%{?dist}
+Version: 1.1
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -10,11 +10,10 @@
 # This will get fixed as soon as hosted can create attachments directly
 
 Source: https://hosted.fedoraproject.org/projects/smolt/attachment/wiki/WikiStart/%{name}-%{version}.tar.gz
-Source1: smoltFirstBoot.py
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
-Requires: dbus-python, python-crypto, python-urlgrabber
+Requires: dbus-python, python-crypto, python-urlgrabber, gawk
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 
@@ -35,7 +34,7 @@
 Summary: Fedora hardware profiler server
 Group: Applications/Internet
 Requires: smolt = %{version}-%{release}
-Requires: TurboGears
+Requires: TurboGears mx
 
 %description server
 The Fedora hardware profiler is a server-client system that does a hardware
@@ -65,7 +64,6 @@
 
 %prep
 %setup -q
-%{__cp} %{SOURCE1} client/
 
 %build
 cd client/
@@ -80,6 +78,7 @@
 %{__cp} -adv smoon/* %{buildroot}/%{_datadir}/%{name}/smoon/
 %{__cp} -adv client/simplejson %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/scan.py %{buildroot}/%{_datadir}/%{name}/client/
+%{__cp} client/fs_util.py %{buildroot}/%{_datadir}/%{name}/client/
 
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/sysconfig/
 #%{__mkdir} -p %{buildroot}/%{_sysconfdir}/cron.d/
@@ -139,12 +138,11 @@
 
 %post
 /sbin/chkconfig --add smolt
-if ! [ -f %{_sysconfdir}/sysconfig/hw-uuid ]
-then
-    /bin/cat /proc/sys/kernel/random/uuid > %{_sysconfdir}/sysconfig/hw-uuid
-    /bin/chmod 0644 %{_sysconfdir}/sysconfig/hw-uuid
-    /bin/chown root:root %{_sysconfdir}/sysconfig/hw-uuid
-fi
+
+#Randomize checkin times.
+TMPFILE=$(/bin/mktemp /tmp/smolt.XXXXX)
+/bin/awk '{ srand(); if($2 == 1 && $3 == 1) print $1,int((rand() * 100) % 22 + 1),int((rand() * 100) % 27 + 1),substr($0,index($0,$4)); else print $0}' /etc/cron.d/smolt > $TMPFILE
+/bin/mv $TMPFILE /etc/cron.d/smolt
 
 %preun
 if [ $1 = 0 ]; then
@@ -182,6 +180,9 @@
 %{_bindir}/smoltGui
 
 %changelog
+* Fri Feb 01 2008 Mike McGrath <mmcgrath at redhat.com> 1.0-5
+- Added a req for mx on smoon
+
 * Thu Jan 08 2008 Mike McGrath <mmcgrath at redhat.com> 1.0-4
 - Fixed firstboot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	20 Nov 2007 20:48:31 -0000	1.20
+++ sources	14 Feb 2008 19:19:03 -0000	1.21
@@ -1 +1 @@
-8f3935f21cb28e4d09742f490a3eaed0  smolt-1.0.tar.gz
+10e7954f099c196f2e1c5ea3f977b84c  smolt-1.1.tar.gz