rpms/smolt/F-10 0001-Client-Hopefully-fix-encoding-trouble.patch, NONE, 1.1 smolt.spec, 1.56, 1.57 sources, 1.25, 1.26
Mike McGrath
mmcgrath at fedoraproject.org
Wed Sep 23 21:39:03 UTC 2009
Author: mmcgrath
Update of /cvs/pkgs/rpms/smolt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26235/F-10
Modified Files:
smolt.spec sources
Added Files:
0001-Client-Hopefully-fix-encoding-trouble.patch
Log Message:
updating to latest version
0001-Client-Hopefully-fix-encoding-trouble.patch:
sendProfile.py | 9 +++++----
smolt.py | 12 +++++++++++-
2 files changed, 16 insertions(+), 5 deletions(-)
--- NEW FILE 0001-Client-Hopefully-fix-encoding-trouble.patch ---
>From 7243f1fcc395cdf87815ac5a33c0d2f8b61c0cdf Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian at pipping.org>
Date: Sun, 20 Sep 2009 21:38:35 +0200
Subject: [PATCH 1/2] Client: Hopefully fix encoding trouble
More or less a squashed cherry-pick from these commits:
- 7592c44f6eef240aaae147ba11ffe85a4156068b
- 81bfa3f0f5172d853f95034e061c4e3a4bd55ebe
- b21ddc39c1e51329a957a463aff3b7db09f5a726
- fa41853f7fcbe5e465bbd25fbe94942a87a5d2bb
---
client/sendProfile.py | 9 +++++----
client/smolt.py | 11 +++++++++++
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/client/sendProfile.py b/client/sendProfile.py
index 46b0f18..ff3a0a9 100644
--- a/client/sendProfile.py
+++ b/client/sendProfile.py
@@ -36,6 +36,7 @@ import smolt
from smolt import debug
from smolt import error
from smolt import get_config_attr
+from smolt import to_ascii
from scan import scan, rating
from gate import GateFromConfig
@@ -179,10 +180,10 @@ if not opts.autoSend:
'label_fs_related':_('File system-related'),
'label_distro_specific':_('Distribution-specific'),
- 'general':inner_indent(profile.get_general_info_excerpt()),
- 'devices':inner_indent(profile.get_devices_info_excerpt()),
- 'file_system':inner_indent(profile.get_file_system_info_excerpt()),
- 'distro':inner_indent(profile.get_distro_info_excerpt()),
+ 'general':inner_indent(to_ascii(profile.get_general_info_excerpt())),
+ 'devices':inner_indent(to_ascii(profile.get_devices_info_excerpt())),
+ 'file_system':inner_indent(to_ascii(profile.get_file_system_info_excerpt())),
+ 'distro':inner_indent(to_ascii(profile.get_distro_info_excerpt())),
}
submit = False
diff --git a/client/smolt.py b/client/smolt.py
index dee142f..7016ab6 100644
--- a/client/smolt.py
+++ b/client/smolt.py
@@ -51,6 +51,7 @@ from fs_util import get_fslist
from gate import Gate
from uuiddb import UuidDb
+import codecs
WITHHELD_MAGIC_STRING = 'WITHHELD'
SELINUX_ENABLED = 1
@@ -140,6 +141,16 @@ PCI_CLASS_SERIAL_USB = 3
PCI_CLASS_SERIAL_FIBER = 4
PCI_CLASS_SERIAL_SMBUS = 5
+def to_ascii(o, current_encoding='utf-8'):
+ if not isinstance(o, basestring):
+ return o
+
+ if isinstance(o, unicode):
+ s = o
+ else:
+ s = unicode(o, current_encoding)
+ return codecs.encode(s, 'ascii', 'ignore')
+
class Device:
def __init__(self, props, hardware):
self.UUID = getUUID()
--
1.6.2.5
Index: smolt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/F-10/smolt.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- smolt.spec 12 Nov 2008 21:46:48 -0000 1.56
+++ smolt.spec 23 Sep 2009 21:39:03 -0000 1.57
@@ -1,17 +1,17 @@
Name: smolt
+
Summary: Fedora hardware profiler
-Version: 1.1.1.1
-Release: 9%{?dist}
+Version: 1.4
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/Internet
-URL: http://hosted.fedoraproject.org/projects/smolt
+URL: http://fedorahosted.org/smolt
Source: https://fedorahosted.org/releases/s/m/%{name}/%{name}-%{version}.tar.gz
-Patch0: scan.patch
-Patch1: smolt.py.patch
+Patch0: 0001-Client-Hopefully-fix-encoding-trouble.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
Requires: dbus-python, python-urlgrabber, gawk, python-paste
+BuildArch: noarch
BuildRequires: gettext
BuildRequires: desktop-file-utils
@@ -21,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
@@ -60,6 +61,7 @@ separate package so firstboot isn't a re
Summary: Fedora hardware profiler gui
Group: Applications/Internet
Requires: smolt = %{version}-%{release}
+Requires: PyQt4
%description gui
Provides smolt's gui functionality. Not included in the default package to
@@ -67,8 +69,7 @@ ensure that deps are kept small.
%prep
%setup -q
-%patch0 -p0
-%patch1 -p0
+%patch0 -p1
%build
cd client/
@@ -82,14 +83,16 @@ 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/
%{__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 +103,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
@@ -110,13 +115,16 @@ touch %{buildroot}/%{_sysconfdir}/syscon
%{__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
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/client/config.py
+
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 %{_sysconfdir}/%{name}/config.py %{buildroot}/%{_datadir}/%{name}/client/config.py
+
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)
@@ -146,14 +154,36 @@ 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/*
%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
@@ -179,6 +209,48 @@ fi
%{_bindir}/smoltGui
%changelog
+* 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
+
+* 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.
+
+* 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
+
+* Fri Nov 21 2008 Mike McGrath <mmcgrath at redhat.com> 1.1.1.1-10
+- Fix for bug 472101
+
* Wed Nov 12 2008 Mike McGrath <mmcgrath at redhat.com> 1.1.1.1-9
- Fix for bug 470829
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/smolt/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources 4 Sep 2008 20:18:32 -0000 1.25
+++ sources 23 Sep 2009 21:39:03 -0000 1.26
@@ -1 +1 @@
-c723a6808de0954e8e3e9228c7c94946 smolt-1.1.1.1.tar.gz
+a5a56912381e71f75b4c0368670a0ca8 smolt-1.4.tar.gz
More information about the fedora-extras-commits
mailing list