rpms/smolt/EL-5 smolt.spec,1.36,1.37 sources,1.22,1.23

[Mike McGrath]

Author: mmcgrath

Update of /cvs/pkgs/rpms/smolt/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30377

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


Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/EL-5/smolt.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- smolt.spec	3 Dec 2008 15:14:46 -0000	1.36
+++ smolt.spec	8 Jul 2009 19:03:50 -0000	1.37
@@ -1,17 +1,16 @@
 Name: smolt
 Summary: Fedora hardware profiler
-Version: 1.2
-Release: 3%{?dist}
+Version: 1.3
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
 Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz
-Patch0: smolt-1.2-install.patch
-Patch1: smolt-1.2-python24.patch
+source1: smoltGui.py
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires: dbus-python, python-urlgrabber, gawk, python-paste
 BuildArch: noarch
-Requires: dbus-python, python-urlgrabber, gawk, python-paste, python-ctypes
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 
@@ -67,8 +66,6 @@ ensure that deps are kept small.
 
 %prep
 %setup -q
-%patch0 -p1 -b .install
-%patch1 -p1 -b .python24
 
 %build
 cd client/
@@ -84,12 +81,16 @@ cd ..
 %{__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/gate.py %{buildroot}/%{_datadir}/%{name}/client/
+%{__cp} client/os_detect.py %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/fs_util.py %{buildroot}/%{_datadir}/%{name}/client/
 %{__cp} client/man/* %{buildroot}/%{_mandir}/man1/
+%{__cp} %{SOURCE1} %{buildroot}/%{_datadir}/%{name}/client/
 
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/sysconfig/
 %{__mkdir} -p %{buildroot}/%{_datadir}/firstboot/modules/
 %{__mkdir} -p %{buildroot}/%{_initrddir}
+
 %{__mv} client/smoltFirstBoot.py %{buildroot}/%{_datadir}/firstboot/modules/smolt.py
 %{__mv} client/smolt-init %{buildroot}/%{_initrddir}/smolt
 
@@ -100,8 +101,10 @@ touch %{buildroot}/%{_sysconfdir}/syscon
 %{__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
@@ -146,6 +149,28 @@ if [ $1 = 0 ]; then
         /sbin/chkconfig --del smolt
 fi
 
+%post server
+#Fail, will fix later
+for f in delete.html deviceclass.html device.html devices.html error.html \
+         link.html login.html master.html myHosts.html notLoaded.html \
+         pub_uuid.html raw.html report_device_ratings.html \
+         report_host_ratings.html report_recent.html report_search_devices.html\
+         report_search.html report_search_profiles.html report_view_device.html\
+         report_view_devices.html report_view.html report_view_profile.html \
+         report_view_profiles.html showall.html show.html stats.html token.html\
+         welcome.html
+do
+    touch %{_datadir}/%{name}/smoon/hardware/static/stats/$f
+done
+
+%post gui
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun gui
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README GPL doc/*
@@ -179,12 +204,25 @@ fi
 %{_bindir}/smoltGui
 
 %changelog
-* Wed Dec 3 2008 Mike McGrath <mmcgrath at redhat.com> 1.2-3
-- Added python-ctypes require
+* Thu Jul 02 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3-1
+- Added touch for generated stats
+- Upstream released new version
+
+* Tue Apr 14 2009 Mike McGrath <mmcgrath at redhat.com> - 1.2-4.2
+- Removed fake attack
+
+* Fri Mar 13 2009 Mike McGrath <mmcgrath at redhat.com> - 1.2-4.1
+- Fixed some formatting in the spec file
+- Added note to %post
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Jan 21 2009 Mike McGrath <mmcgrath at redhat.com> - 1.2-3
+- Added os_detect.py as it is now required.
 
-* Wed Dec 3 2008 Lubomir Rintel <lkundrak at v3.sk> 1.2-2
-- Add missing file to client
-- Fix run with python 2.4 in RHEL-5
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.2-2
+- Rebuild for Python 2.6
 
 * Sun Nov 30 2008 Mike McGrath <mmcgrath at redhat.com> 1.2-1
 - Upstream released new version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/EL-5/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	30 Nov 2008 19:57:26 -0000	1.22
+++ sources	8 Jul 2009 19:03:50 -0000	1.23
@@ -1 +1 @@
-c577b0bc190542fe6d1927c47bc91abb  smolt-1.2.tar.gz
+72fa94c3a866583477bb1c2b587869f9  smolt-1.3.tar.gz