rpms/smolt/EL-5 smolt.spec,1.39,1.40

Mike McGrath mmcgrath at fedoraproject.org
Wed Sep 23 21:36:35 UTC 2009 

Author: mmcgrath

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

Modified Files:
	smolt.spec 
Log Message:
releasing 1.4 for various fixes.  Unfortunately it breaks the gui.  Still working on a fix for it


Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/EL-5/smolt.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- smolt.spec	9 Jul 2009 17:03:12 -0000	1.39
+++ smolt.spec	23 Sep 2009 21:36:35 -0000	1.40
@@ -1,15 +1,16 @@
 Name: smolt
+
 Summary: Fedora hardware profiler
-Version: 1.3.1
-Release: 1.1%{?dist}
+Version: 1.4
+Release: 2.1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://fedorahosted.org/smolt
 Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz
-source1: smoltGui.py
+Patch0: 0001-Client-Hopefully-fix-encoding-trouble.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: dbus-python, python-urlgrabber, gawk, python-paste
+Requires: dbus-python, python-urlgrabber, gawk, python-paste, python-ctypes
 BuildArch: noarch
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
@@ -20,6 +21,7 @@ Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
+Requires: python-simplejson
 
 %description
 The Fedora hardware profiler is a server-client system that does a hardware
@@ -66,6 +68,7 @@ ensure that deps are kept small.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 cd client/
@@ -79,13 +82,11 @@ 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/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/
@@ -97,29 +98,34 @@ cd ..
 touch %{buildroot}/%{_sysconfdir}/sysconfig/hw-uuid
 
 # 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}/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/
+#%{__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/
+%{__rm} -rf %{buildroot}/%{_datadir}/icons/
 %{__cp} -adv client/icons/smolt-icon-48.png %{buildroot}/%{_datadir}/firstboot/themes/default/smolt.png
+#
+%{__rm} -f %{buildroot}/%{_bindir}/smoltSendProfile %{buildroot}/%{_bindir}/smoltDeleteProfile
+%{__rm} -f %{buildroot}/%{_bindir}/smoltGui
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/client/config.py
 
-%{__rm} -f %{buildroot}/%{_bindir}/smoltSendProfile %{buildroot}/%{_bindir}/smoltDeleteProfile %{buildroot}/%{_bindir}/smoltGui
 ln -s %{_datadir}/%{name}/client/sendProfile.py %{buildroot}/%{_bindir}/smoltSendProfile
 ln -s %{_datadir}/%{name}/client/deleteProfile.py %{buildroot}/%{_bindir}/smoltDeleteProfile
-ln -s %{_datadir}/%{name}/client/smoltGui.py %{buildroot}/%{_bindir}/smoltGui
-
+#ln -s %{_datadir}/%{name}/client/smoltGui.py %{buildroot}/%{_bindir}/smoltGui
 ln -s %{_sysconfdir}/%{name}/config.py %{buildroot}/%{_datadir}/%{name}/client/config.py
 
-desktop-file-install --vendor='fedora' --dir=%{buildroot}/%{_datadir}/applications client/smolt.desktop
+
+#desktop-file-install --vendor='fedora' --dir=%{buildroot}/%{_datadir}/applications client/smolt.desktop
+%{__rm} -f %{buildroot}/%{_datadir}/applications/smolt.desktop
 %find_lang %{name}
 
 # Cleanup from the Makefile (will be cleaned up when it is finalized)
@@ -163,13 +169,13 @@ 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 || :
+#%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,-)
@@ -177,8 +183,8 @@ touch --no-create %{_datadir}/icons/hico
 %dir %{_datadir}/%{name}
 %dir %{_sysconfdir}/%{name}/
 %{_datadir}/%{name}/client
-%ghost %{_datadir}/%{name}/client/scan.pyc
-%ghost %{_datadir}/%{name}/client/scan.pyo
+#%ghost %{_datadir}/%{name}/client/scan.pyc
+#%ghost %{_datadir}/%{name}/client/scan.pyo
 %{_datadir}/%{name}/doc
 %{_bindir}/smoltSendProfile
 %{_bindir}/smoltDeleteProfile
@@ -199,14 +205,31 @@ touch --no-create %{_datadir}/icons/hico
 
 %files gui
 %defattr(-,root,root,-)
-%{_datadir}/applications/fedora-smolt.desktop
-%{_datadir}/icons/hicolor/*x*/apps/smolt.png
-%{_bindir}/smoltGui
+#%{_datadir}/applications/fedora-smolt.desktop
+#%{_datadir}/icons/hicolor/*x*/apps/smolt.png
+#%{_bindir}/smoltGui
 
 %changelog
-* Thu Jul 09 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3.1-1.1
+* Wed Sep 23 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-2.1
+- removed gui
+- Added python-ctypes requirement
+
+* Mon Sep 21 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-2
+- Patched issue with translations (already upstream)
+
+* Mon Sep 14 2009 Mike McGrath <mmcgrath at redhat.com> 1.4-1
 - Upstream released new version
 
+* Thu Sep 10 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3.2-2
+- Added requires for PyQt4 on smolt gui
+
+* Thu Sep 03 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3.2-1
+- Upstream released new version
+- Changed some link and copy info
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul 02 2009 Mike McGrath <mmcgrath at redhat.com> - 1.3-1
 - Added touch for generated stats
 - Upstream released new version

More information about the fedora-extras-commits mailing list