rpms/smolt/devel .cvsignore, 1.11, 1.12 smolt.spec, 1.20, 1.21 sources, 1.12, 1.13

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	11 Apr 2007 15:07:44 -0000	1.11
+++ .cvsignore	23 Apr 2007 01:59:11 -0000	1.12
@@ -1 +1 @@
-smolt-0.9.6.tar.gz
+smolt-0.9.7.1.tar.gz


Index: smolt.spec
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/smolt.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- smolt.spec	17 Apr 2007 17:45:48 -0000	1.20
+++ smolt.spec	23 Apr 2007 01:59:11 -0000	1.21
@@ -1,7 +1,7 @@
 Name: smolt
 Summary: Fedora hardware profiler
-Version: 0.9.6
-Release: 4%{?dist}
+Version: 0.9.7.1
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://hosted.fedoraproject.org/projects/smolt
@@ -16,6 +16,7 @@
 Requires: dbus-python
 BuildRequires: gettext
 BuildRequires: /usr/bin/msgfmt.py
+BuildRequires: desktop-file-utils
 
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -53,6 +54,15 @@
 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
+Requires: smolt = %{version}-%{release}
+
+%description gui
+Provides smolt's gui functionality.  Not included in the default package to
+ensure that deps are kept small.
+
 %prep
 %setup -q
 
@@ -75,13 +85,27 @@
 %{__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/
-%{__cp} -adv client/*.png %{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/
+%{__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/
+%{__cp} -adv client/icons/smolt-icon-48.png %{buildroot}/%{_datadir}/firstboot/pixmaps/smolt.png
 
 %{__mkdir} -p %{buildroot}/%{_datadir}/%{name}/doc
 %{__install} -p -m 0644 doc/PrivacyPolicy %{buildroot}/%{_datadir}/%{name}/doc
@@ -94,6 +118,8 @@
 %{__chmod} +x %{buildroot}/%{_datadir}/%{name}/client/smoltGui.py
 %{__chmod} +x %{buildroot}/%{_initrddir}/smolt
 
+desktop-file-install --vendor='fedora' --dir=%{buildroot}/%{_datadir}/applications client/smolt.desktop
+
 %find_lang %{name}
 
 %clean
@@ -120,7 +146,8 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/client
 %{_datadir}/%{name}/doc
-%{_bindir}/%{name}*
+%{_bindir}/smoltSendProfile
+%{_bindir}/smoltDeleteProfile
 %{_sysconfdir}/cron.d/%{name}
 %{_initrddir}/%{name}
 %ghost %config(noreplace) %{_sysconfdir}/sysconfig/hw-uuid
@@ -132,8 +159,18 @@
 %files firstboot
 %defattr(-,root,root,-)
 %{_datadir}/firstboot/modules/smolt.py*
+%{_datadir}/firstboot/pixmaps/smolt.png
+
+%files gui
+%defattr(-,root,root,-)
+%{_datadir}/applications/fedora-smolt.desktop
+%{_datadir}/icons/hicolor/*x*/apps/smolt.png
+%{_bindir}/smoltGui
 
 %changelog
+* Sun Apr 22 2007 Mike McGrath <mmcgrath at redhat.com> - 0.9.7.1-3
+- Added smolt icons
+
 * 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.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smolt/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	11 Apr 2007 15:07:44 -0000	1.12
+++ sources	23 Apr 2007 01:59:11 -0000	1.13
@@ -1 +1 @@
-3830a86f5daa98260a3ece24094f9791  smolt-0.9.6.tar.gz
+bea91c0f121b8d941f9412e474616c43  smolt-0.9.7.1.tar.gz