Hello community, here is the log from the commit of package smolt for openSUSE:Factory checked in at Tue Aug 4 12:34:56 CEST 2009. -------- --- smolt/smolt.changes 2009-05-10 09:55:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/smolt/smolt.changes 2009-08-01 02:16:09.000000000 +0200 @@ -1,0 +2,31 @@ +Sat Aug 1 00:11:54 UTC 2009 - cgoncalves@opensuse.org + +- smolt-1.3.2-unicode.patch: fix an 'oops' when calling unicode +- smolt-1.3.2-smolt_page.patch: disable "My Smolt Page" if no UUID + found (eg. running for the very first time) + +------------------------------------------------------------------- +Fri Jul 31 20:08:29 UTC 2009 - cgoncalves@opensuse.org + +- update spec file header to the current smolt version +- check if hw-uuid exists before moving uuid + +------------------------------------------------------------------- +Wed Jul 29 16:19:24 UTC 2009 - cgoncalves@opensuse.org + +- support smolt update (move uuid file to hw-uuid) +- minor init script fixes + +------------------------------------------------------------------- +Wed Jul 29 11:50:05 UTC 2009 - cgoncalves@opensuse.org + +- fix init script (%stop_on_removal was failing due to it) + +------------------------------------------------------------------- +Wed Jul 29 01:00:44 UTC 2009 - cgoncalves@opensuse.org + +- updated to version 1.3.2 + * new client GUI + * various bugfixes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- smolt-1.1.1.1-config.patch smolt-1.1.1.1-gui_pub_uuid.patch smolt-1.1.1.1-make_install.patch smolt-1.1.1.1-suse_release_arch.patch smolt-1.1.1.1-uuidfile_path.patch smolt-1.1.1.1.tar.bz2 New: ---- smolt-1.3-make_install.patch smolt-1.3.2-smolt_page.patch smolt-1.3.2-unicode.patch smolt-1.3.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smolt.spec ++++++ --- /var/tmp/diff_new_pack.t4EGqf/_old 2009-08-04 12:34:30.000000000 +0200 +++ /var/tmp/diff_new_pack.t4EGqf/_new 2009-08-04 12:34:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package smolt (Version 1.1.1.1) +# spec file for package smolt (Version 1.3.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,24 +19,22 @@ Name: smolt Summary: Hardware Profiler -Version: 1.1.1.1 -Release: 55 +Version: 1.3.2 +Release: 1 License: GPL v2 or later Group: Hardware/Other Url: https://hosted.fedoraproject.org/projects/smolt/ Source0: %{name}-%{version}.tar.bz2 Source1: smolt.init -Patch0: %name-%version-uuidfile_path.patch Patch1: smolt-1.1.1.1-desktop_file.patch -Patch2: smolt-1.1.1.1-make_install.patch -Patch3: smolt-1.1.1.1-config.patch -Patch4: smolt-1.1.1.1-gui_pub_uuid.patch -Patch5: smolt-1.1.1.1-suse_release_arch.patch +Patch2: smolt-1.3-make_install.patch +Patch3: smolt-1.3.2-unicode.patch +Patch4: smolt-1.3.2-smolt_page.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Requires: dbus-1-python python-urlgrabber cron python-gtk -BuildRequires: fdupes gettext python-demo update-desktop-files -PreReq: /bin/cat +Requires: dbus-1-python python-urlgrabber cron python-qt4 python-simplejson +BuildRequires: fdupes gettext update-desktop-files +PreReq: /bin/cat coreutils %description The smolt hardware profiler is a server-client system that does a @@ -51,20 +49,14 @@ %prep %setup -q -%patch0 %patch1 %patch2 -%patch3 -%patch4 -%patch5 +%patch3 -p1 +%patch4 -p1 cp %{S:1} . %build cd client/ -# ugly ugly hack -cp /usr/share/doc/packages/python/Tools/i18n/msgfmt.py . -cp /usr/share/doc/packages/python/Tools/i18n/pygettext.py . -chmod +x msgfmt.py pygettext.py make %install @@ -72,7 +64,7 @@ make DESTDIR=$RPM_BUILD_ROOT install install -D -m 755 %{S:1} %{buildroot}/%{_initrddir}/smolt ln -s %{_initrddir}/smolt %{buildroot}/%_bindir/rcsmolt -touch %{buildroot}/%{_sysconfdir}/smolt/uuid +touch %{buildroot}/%{_sysconfdir}/smolt/hw-uuid rm -rf %{buildroot}/usr/share/locale/sr@latin %{buildroot}/usr/share/locale/default popd %fdupes %{buildroot} @@ -84,14 +76,25 @@ %clean rm -rf %{buildroot} +%pre +if [ -f %{_sysconfdir}/smolt/uuid -a ! -f %{_sysconfdir}/smolt/hw-uuid ] +then + /bin/mv %{_sysconfdir}/smolt/uuid %{_sysconfdir}/smolt/hw-uuid + /bin/chmod 0644 %{_sysconfdir}/smolt/hw-uuid + /bin/chown root:root %{_sysconfdir}/smolt/hw-uuid +fi + %post -if ! [ -f %{_sysconfdir}/smolt/uuid ] +if ! [ -f %{_sysconfdir}/smolt/hw-uuid ] then - /bin/cat /proc/sys/kernel/random/uuid > %{_sysconfdir}/smolt/uuid - /bin/chmod 0644 %{_sysconfdir}/smolt/uuid - /bin/chown root:root %{_sysconfdir}/smolt/uuid + /bin/cat /proc/sys/kernel/random/uuid > %{_sysconfdir}/smolt/hw-uuid + /bin/chmod 0644 %{_sysconfdir}/smolt/hw-uuid + /bin/chown root:root %{_sysconfdir}/smolt/hw-uuid fi +%preun +%stop_on_removal smolt + %postun %insserv_cleanup @@ -99,7 +102,7 @@ %defattr(-,root,root,-) %doc README GPL doc/* %dir %{_sysconfdir}/smolt -%ghost %{_sysconfdir}/smolt/uuid +%ghost %{_sysconfdir}/smolt/hw-uuid %config(noreplace)%{_sysconfdir}/smolt/config.py %{_bindir}/* %config %{_sysconfdir}/cron.d/%{name} ++++++ smolt-1.1.1.1-make_install.patch -> smolt-1.3-make_install.patch ++++++ --- smolt/smolt-1.1.1.1-make_install.patch 2008-04-04 01:14:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/smolt/smolt-1.3-make_install.patch 2009-07-17 23:33:43.000000000 +0200 @@ -1,57 +1,22 @@ ---- client/Makefile -+++ client/Makefile -@@ -2,7 +2,7 @@ - MO_FILES=$(patsubst %.po,%.mo,$(PO_FILES)) - PY_FILES=deleteProfile.py haldump.py __init__.py sendProfile.py smoltGui.py smolt.py software.py smoltFirstBoot.py gui.py privacypolicy.py scan.py - DIRED_MO_FILES=$(patsubst po/%.mo,mo/%/LC_MESSAGES/$(NAME).mo,$(MO_FILES)) --CLIENT_FILES=deleteProfile.py gui.py haldump.py i18n.py privacypolicy.py sendProfile.py smolt.py smoltGui.py software.py scan.py -+CLIENT_FILES=deleteProfile.py gui.py haldump.py i18n.py privacypolicy.py sendProfile.py smolt.py smoltGui.py software.py scan.py fs_util.py simplejson - - - NAME=smolt -@@ -39,7 +39,7 @@ - cp -advr config.py $(SMOLTCONFIGDIR) - - install -d -m 0755 ./ $(DATADIR)/$(NAME)/client/ -- install -d -m 0755 icons/ $(DATADIR)/$(NAME)/client/icons/ -+ install -D -m 0644 icons/smolt-about.png $(DATADIR)/$(NAME)/client/icons/smolt-about.png - cp -adv $(CLIENT_FILES) $(DATADIR)/$(NAME)/client/ - - -@@ -56,9 +56,7 @@ +--- client/Makefile.orig 2009-07-17 22:13:14.000000000 +0100 ++++ client/Makefile 2009-07-17 22:14:50.000000000 +0100 +@@ -59,14 +59,12 @@ mkdir -p $(DATADIR)/$(NAME)/doc install -p -m 0644 ../doc/PrivacyPolicy $(DATADIR)/$(NAME)/doc - gzip -9 man/smoltSendProfile.1 > $(DATADIR)/man/man1/smoltSendProfile.1.gz - gzip -9 man/smoltDeleteProfile.1 > $(DATADIR)/man/man1/smoltDeleteProfile.1.gz - gzip -9 man/smoltGui.1 > $(DATADIR)/man/man1/smoltGui.1.gz -+ cp man/* $(DATADIR)/man/man1/ - - ln -sf $(DATADIR)/$(NAME)/client/sendProfile.py $(BINDIR)/smoltSendProfile - ln -sf $(DATADIR)/$(NAME)/client/deleteProfile.py $(BINDIR)/smoltDeleteProfile -@@ -58,9 +58,10 @@ - - cp man/* $(DATADIR)/man/man1/ ++ cp man/* $(DATADIR)/man/man1/ - ln -sf $(DATADIR)/$(NAME)/client/sendProfile.py $(BINDIR)/smoltSendProfile - ln -sf $(DATADIR)/$(NAME)/client/deleteProfile.py $(BINDIR)/smoltDeleteProfile - ln -sf $(DATADIR)/$(NAME)/client/smoltGui.py $(BINDIR)/smoltGui +- ln -sf $(SMOLTCONFIGDIR)/config.py $(DATADIR)/$(NAME)/client/config.py + ln -sf /usr/share/$(NAME)/client/sendProfile.py $(BINDIR)/smoltSendProfile + ln -sf /usr/share/$(NAME)/client/deleteProfile.py $(BINDIR)/smoltDeleteProfile -+ ln -sf /usr/share/$(NAME)/client/smoltGui.py $(BINDIR)/smoltGui ++ ln -sf /usr/share//$(NAME)/client/smoltGui.py $(BINDIR)/smoltGui + ln -sf /etc/smolt/config.py $(DATADIR)/$(NAME)/client/config.py chmod +x $(DATADIR)/$(NAME)/client/*Profile.py chmod +x $(DATADIR)/$(NAME)/client/smoltGui.py -@@ -67,7 +67,8 @@ - chmod +x $(DATADIR)/$(NAME)/client/*Profile.py - chmod +x $(DATADIR)/$(NAME)/client/smoltGui.py - -- desktop-file-install --vendor='fedora' --dir=$(DATADIR)/applications ./smolt.desktop -+ mkdir -p $(DATADIR)/applications -+ cp smolt.desktop $(DATADIR)/applications/ - - move-mo: $(DIRED_MO_FILES) - - - ++++++ smolt-1.3.2-smolt_page.patch ++++++ diff --git a/client/smoltGui.py b/client/smoltGui.py index 6c4e232..72bd15c 100644 --- a/client/smoltGui.py +++ b/client/smoltGui.py @@ -50,6 +50,11 @@ class GatherThread(QThread): time.sleep(5) try: self.hardware = smolt.Hardware() + try: + smolt.getPubUUID() + self.emit(SIGNAL('smoltPageStatus(PyQt_PyObject)'), True) + except: + self.emit(SIGNAL('smoltPageStatus(PyQt_PyObject)'), False) self.emit(SIGNAL('profile_ready()')) except smolt.SystemBusError, e: self.error_message = e.message @@ -202,6 +207,9 @@ class SmoltGui(QMainWindow): self._on_profile_ready) self.connect(self._gather_thread, SIGNAL("system_bus_error()"), \ self._on_system_bus_error) + self.connect(self._gather_thread, SIGNAL('smoltPageStatus(PyQt_PyObject)'), \ + self._smoltPageStatus) + self._gather_thread.start() def sendProfile(self): @@ -214,6 +222,7 @@ class SmoltGui(QMainWindow): self._on_submission_failed) self.connect(self._submit_thread, SIGNAL('submission_completed()'), \ self._on_submission_completed) + self._submit_thread.start() def _tear_progress_down(self, success=False): @@ -245,6 +254,18 @@ class SmoltGui(QMainWindow): {'url':url, 'password':admin_password}, QMessageBox.NoButton, self).exec_() + self._smoltPageStatus(enable=True) + + def _smoltPageStatus(self, enable=None): + if enable != None: + self.mySmoltPageAction.setEnabled(enable) + else: + try: + smolt.getPubUUID() + self.mySmoltPageAction.setEnabled(True) + except smolt.PubUUIDError, e: + self.mySmoltPageAction.setEnabled(False) + def openSmoltPage(self): ''' Open My Smolt Page ''' ++++++ smolt-1.3.2-unicode.patch ++++++ diff --git a/client/smoltGui.py b/client/smoltGui.py index 72bd15c..1fd3ab5 100644 --- a/client/smoltGui.py +++ b/client/smoltGui.py @@ -236,8 +236,8 @@ class SmoltGui(QMainWindow): def _on_submission_failed(self): self._tear_progress_down(success=False) - QMessageBox(QMessageBox.Critical, unicode(_('Error', 'UTF-8')), - unicode(_('An error occurred while sending the data to the server.', 'UTF-8')), + QMessageBox(QMessageBox.Critical, unicode(_('Error'), 'UTF-8'), + unicode(_('An error occurred while sending the data to the server.'), 'UTF-8'), QMessageBox.Ok, self).exec_() def _on_submission_completed(self): ++++++ smolt-1.1.1.1.tar.bz2 -> smolt-1.3.2.tar.bz2 ++++++ ++++ 46922 lines of diff (skipped) ++++++ smolt.init ++++++ --- /var/tmp/diff_new_pack.t4EGqf/_old 2009-08-04 12:34:32.000000000 +0200 +++ /var/tmp/diff_new_pack.t4EGqf/_new 2009-08-04 12:34:32.000000000 +0200 @@ -50,13 +50,16 @@ ;; stop) echo -n $"Disabling monthly Smolt update: " - /bin/rm "$lockfile" 2> /dev/null + /bin/rm -f "$lockfile" 2> /dev/null rc_status -v ;; restart) $0 stop $0 start ;; + reload) + $0 restart + ;; status) if [ -f $lockfile ]; then echo $"Monthly smolt check-in is enabled." ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org