rpms/smolt/EL-4 smolt.spec,1.26,1.27 sources,1.16,1.17

Thu Mar 6 04:19:50 UTC 2008

Author: mmcgrath

Update of /cvs/extras/rpms/smolt/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11613/EL-4

Modified Files:
	smolt.spec sources 
Log Message:
upstream released a new version


Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/EL-4/smolt.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27

--- smolt.spec	13 Sep 2007 15:32:13 -0000	1.26
+++ smolt.spec	6 Mar 2008 04:19:09 -0000	1.27
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
-Version: 0.9.8.4
-Release: 6%{?dist}
+Version: 1.1.1
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -9,14 +9,16 @@
 # Note: This is a link to the gzip, you can't download it directly
 # 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
+Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
-Requires: dbus-python
+Requires: dbus-python, python-crypto, python-urlgrabber, gawk, python-genshi, python-paste
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 
+Requires(pre): %{_sbindir}/groupadd
+Requires(pre): %{_sbindir}/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -30,6 +32,29 @@
 
 This package contains the client
 
+%package server
+Summary: Fedora hardware profiler server
+Group: Applications/Internet
+Requires: smolt = %{version}-%{release}
+Requires: TurboGears mx
+
+%description server
+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
+turbogears server.  The sends are anonymous and should not contain any private
+information other than the physical hardware information and basic OS info.
+
+This package contains the server portion
+
+%package firstboot
+Summary: Fedora hardware profile firstboot
+Group: Applications/Internet
+Requires: smolt = %{version}-%{release}
+
+%description firstboot
+This provides firstboot integration for smolt.  It has been broken into a
+separate package so firstboot isn't a requisite to use smolt.
+
 %package gui
 Summary: Fedora hardware profiler gui
 Group: Applications/Internet
@@ -51,42 +76,35 @@
 cd client
 DESTDIR=%{buildroot} make install
 cd ..
+%{__install} -d -m 0755 smoon/ %{buildroot}/%{_datadir}/%{name}/smoon/
+%{__mkdir} -p %{buildroot}/%{_mandir}/man1/
+%{__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/
+%{__cp} client/man/* %{buildroot}/%{_mandir}/man1/
 
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/sysconfig/
-#%{__mkdir} -p %{buildroot}/%{_sysconfdir}/cron.d/
-#%{__mkdir} -p %{buildroot}/%{_bindir}
+%{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/modules/
 %{__mkdir} -p %{buildroot}/%{_initrddir}
-#%{__mkdir} -p %{buildroot}/%{_datadir}/locale/
+%{__mv} client/smoltFirstBoot.py %{buildroot}/%{_datadir}/firstboot/modules/smolt.py
 %{__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
 
-#%{__install} -d -m 0755 client/ %{buildroot}/%{_datadir}/%{name}/client/
-#%{__install} -d -m 0755 client/icons/ %{buildroot}/%{_datadir}/%{name}/client/icons/
-#%{__cp} -adv client/*.py %{buildroot}/%{_datadir}/%{name}/client/
-
 # Icons
 %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/
 %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/
 %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/
 %{__mkdir} -p %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/
+%{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/pixmaps/
+%{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/themes/default/
 %{__mv} client/icons/smolt-icon-16.png %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps/smolt.png
 %{__mv} client/icons/smolt-icon-22.png %{buildroot}/%{_datadir}/icons/hicolor/22x22/apps/smolt.png
 %{__mv} client/icons/smolt-icon-24.png %{buildroot}/%{_datadir}/icons/hicolor/24x24/apps/smolt.png
 %{__mv} client/icons/smolt-icon-32.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/smolt.png
 %{__cp} -adv client/icons/* %{buildroot}/%{_datadir}/%{name}/client/icons/
-
-#%{__mkdir} -p %{buildroot}/%{_datadir}/%{name}/doc
-#%{__install} -p -m 0644 doc/PrivacyPolicy %{buildroot}/%{_datadir}/%{name}/doc
-
-#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/*Profile.py
-#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/smoltGui.py
-#%{__chmod} +x %{buildroot}/%{_initrddir}/smolt
+%{__cp} -adv client/icons/smolt-icon-48.png %{buildroot}/%{_datadir}/firstboot/themes/default/smolt.png
 
 %{__rm} -f %{buildroot}/%{_bindir}/smoltSendProfile %{buildroot}/%{_bindir}/smoltDeleteProfile %{buildroot}/%{_bindir}/smoltGui
 ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile
@@ -104,14 +122,19 @@
 %clean
 rm -rf %{buildroot}
 
+%pre
+%{_sbindir}/groupadd -r %{name} &>/dev/null || :
+%{_sbindir}/useradd  -r -s /sbin/nologin -d %{_datadir}/%{name} -M \
+                               -c 'Smolt' -g %{name} %{name} &>/dev/null || :
+
 %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/cp $TMPFILE /etc/cron.d/smolt
+/bin/rm -f $TMPFILE
 
 %preun
 if [ $1 = 0 ]; then
@@ -123,15 +146,26 @@
 %defattr(-,root,root,-)
 %doc README GPL doc/*
 %dir %{_datadir}/%{name}
+%dir %{_sysconfdir}/%{name}/
 %{_datadir}/%{name}/client
 %{_datadir}/%{name}/doc
 %{_bindir}/smoltSendProfile
 %{_bindir}/smoltDeleteProfile
-%{_sysconfdir}/%{name}/config.*
+%config(noreplace) /%{_sysconfdir}/%{name}/config*
 %{_sysconfdir}/cron.d/%{name}
+%{_mandir}/man1/*gz
 %{_initrddir}/%{name}
 %ghost %config(noreplace) %{_sysconfdir}/sysconfig/hw-uuid
 
+%files server
+%defattr(-,root,root,-)
+%{_datadir}/%{name}/smoon
+
+%files firstboot
+%defattr(-,root,root,-)
+%{_datadir}/firstboot/modules/smolt.py*
+%{_datadir}/firstboot/themes/default/smolt.png
+
 %files gui
 %defattr(-,root,root,-)
 %{_datadir}/applications/fedora-smolt.desktop
@@ -139,8 +173,53 @@
 %{_bindir}/smoltGui
 
 %changelog
-* Thu Sep 13 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-6
-- Removed firstboot and server portions for EL-4
+* Wed Mar 05 2008 Mike McGrath <mmcgrath at redhat.com> - 1.1.1-1
+- Upstream released new version
+- Manfiles added
+- Source location updated
+
+* Wed Feb 27 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1-3
+- Copy instead of move cron file so that selinux contexts are set
+  properly. (BZ#435050)
+
+* Wed Feb 27 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.1-2
+- Create smolt user. (BZ#435136)
+
+* 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
+
+* Thu Jan 08 2008 Mike McGrath <mmcgrath at redhat.com> 1.0-3
+- Added python-urlgrabber as a requires - 427969
+
+* Thu Nov 22 2007 Mike McGrath <mmcgrath at redhat.com> 1.0-2
+- Installed scanner - #395901
+
+* Tue Nov 20 2007 Mike McGrath <mmcgrath at redhat.com> 1.0-1
+- Upstream released new version
+
+* Tue Oct 25 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.9.2-1
+- Upstream released new version
+
+* Tue Oct 23 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.9.1-4
+- Upstream released new version
+
+* Thu Oct 18 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.9-2
+- Fixed /etc/smolt/ ownership issue
+
+* Tue Oct 16 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.9-1
+- Upstream released new version
+
+* Fri Sep 28 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-8
+- Fixed Selinux
+
+* Thu Sep 27 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-6
+- Added translations
+
+* Fri Sep 21 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-5
+- Fixed firstboot issues
 
 * Mon Aug 13 2007 Mike McGrath <mmcgrath at redhat.com> 0.9.8.4-4
 - Rebuild to clean up 'config.py' compilations


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smolt/EL-4/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	13 Sep 2007 15:32:13 -0000	1.16
+++ sources	6 Mar 2008 04:19:09 -0000	1.17
@@ -1 +1 @@
-2b79adbf0271160d55f4540008d0859f  smolt-0.9.8.4.tar.gz
+7ec5dc8f7550be524dfd9467bb59f06c  smolt-1.1.1.tar.gz


