Hello community, here is the log from the commit of package smolt checked in at Fri Apr 4 01:14:46 CEST 2008. -------- --- smolt/smolt.changes 2008-01-16 16:25:36.000000000 +0100 +++ /mounts/work_src_done/NOARCH/smolt/smolt.changes 2008-04-03 14:47:21.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Apr 3 13:58:08 CEST 2008 - hvogel@suse.de + +- Update to version 1.1.1.1 + * various bugfixes + * new default configuration + * new default server +- dont stop or restart. its only touching files anyway + +------------------------------------------------------------------- Old: ---- smolt-0.9.8.3-default_server.patch smolt-0.9.8.3-msgfmt.patch smolt-0.9.8.3.tar.bz2 smolt-0.9.8.3-uuidfile_path.patch New: ---- smolt-1.1.1.1-config.patch smolt-1.1.1.1-desktop_file.patch smolt-1.1.1.1-make_install.patch smolt-1.1.1.1.tar.bz2 smolt-1.1.1.1-uuidfile_path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smolt.spec ++++++ --- /var/tmp/diff_new_pack.W14588/_old 2008-04-04 01:14:26.000000000 +0200 +++ /var/tmp/diff_new_pack.W14588/_new 2008-04-04 01:14:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package smolt (Version 0.9.8.3) +# spec file for package smolt (Version 1.1.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -9,22 +9,24 @@ # + Name: smolt Summary: Hardware Profiler -Version: 0.9.8.3 -Release: 46 +Version: 1.1.1.1 +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: smolt-0.9.8.3-msgfmt.patch -Patch1: smolt-0.9.8.3-uuidfile_path.patch -Patch2: smolt-0.9.8.3-default_server.patch +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 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Requires: dbus-1-python python-urlgrabber -BuildRequires: fdupes gettext python-demo +BuildRequires: fdupes gettext python-demo update-desktop-files PreReq: /bin/cat %description @@ -43,6 +45,7 @@ %patch0 %patch1 %patch2 +%patch3 cp %{S:1} . %build @@ -54,69 +57,54 @@ make %install -# Binaries -install -d %{buildroot}/%{_bindir} -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 -install -d -m 0755 %{buildroot}/%{_datadir}/%{name}/client/ -install -d -m 0755 %{buildroot}/%{_datadir}/%{name}/client/icons/ -install -m 644 client/*.py %{buildroot}/%{_datadir}/%{name}/client/ -chmod +x %{buildroot}/%{_datadir}/%{name}/client/*Profile.py -chmod +x %{buildroot}/%{_datadir}/%{name}/client/smoltGui.py -# Cronjob & init script & uuid file -install -D -m 644 client/smolt.cron.monthly %{buildroot}/%{_sysconfdir}/cron.d/smolt -install -D -m 755 smolt.init %{buildroot}/%{_initrddir}/smolt -install -d %{buildroot}/%{_bindir} +pushd client +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 -# Translations -mkdir -p %{buildroot}/%{_datadir}/locale/ -pushd client/po/ && mv zh-CN zh_CN && popd -cp -adv client/po/* %{buildroot}/%{_datadir}/locale/ -find %{buildroot} -name \*.po\* -delete -# Icons -mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/{16x16,22x22,24x24,32x32}/apps/ -for i in 16 22 24 32; do -install -D -m 644 client/icons/smolt-icon-$i.png %{buildroot}/%{_datadir}/icons/hicolor/"$i"x"$i"/apps/smolt.png -done -cp -adv client/icons/* %{buildroot}/%{_datadir}/%{name}/client/icons/ -# Policy -mkdir -p %{buildroot}/%{_datadir}/%{name}/doc -install -p -m 0644 doc/PrivacyPolicy %{buildroot}/%{_datadir}/%{name}/doc -%find_lang %{name} +touch %{buildroot}/%{_sysconfdir}/smolt/uuid +rm -rf %{buildroot}/usr/share/locale/sr@latin %{buildroot}/usr/share/locale/default +popd %fdupes %{buildroot} +%suse_update_desktop_file %name +%find_lang %name %clean rm -rf %{buildroot} %post -if ! [ -f %{_sysconfdir}/smolt.uuid ] +if ! [ -f %{_sysconfdir}/smolt/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/uuid + /bin/chmod 0644 %{_sysconfdir}/smolt/uuid + /bin/chown root:root %{_sysconfdir}/smolt/uuid fi %postun -%restart_on_update smolt %insserv_cleanup -%preun -%stop_on_removal smolt - %files -f %{name}.lang %defattr(-,root,root,-) %doc README GPL doc/* -%ghost %{_sysconfdir}/smolt.uuid -%{_bindir}/* +%dir %{_sysconfdir}/smolt +%ghost %{_sysconfdir}/smolt/uuid +%config(noreplace)%{_sysconfdir}/smolt/config.py %{_bindir}/* %{_sysconfdir}/cron.d/%{name} %{_initrddir}/%{name} %{_datadir}/%{name} %{_datadir}/icons/hicolor +%{_datadir}/applications/smolt.desktop +%{_mandir}/man1/smoltDeleteProfile.1.gz +%{_mandir}/man1/smoltGui.1.gz +%{_mandir}/man1/smoltSendProfile.1.gz %changelog +* Thu Apr 03 2008 hvogel@suse.de +- Update to version 1.1.1.1 + * various bugfixes + * new default configuration + * new default server +- dont stop or restart. its only touching files anyway * Wed Jan 16 2008 hvogel@suse.de - Fix missing requires - Use smolts.org as default server ++++++ smolt-1.1.1.1-config.patch ++++++ --- client/config.py +++ client/config.py @@ -11,10 +11,10 @@ #For Redhat -try: - OS = file('/etc/redhat-release').read().strip() -except IOError: - OS = "Shadowman!" +#try: +# OS = file('/etc/redhat-release').read().strip() +#except IOError: +# OS = "Shadowman!" HW_UUID = "/etc/smolt/uuid" @@ -29,12 +29,12 @@ FS_MOUNTS=commands.getoutput('rpm -ql filesystem').split('\n') ##For SuSE -#try: -# OS = file('/etc/SuSE-release').read().split('\n')[0].strip() -#except IOError: -# OS = "It's a Lizard man!, It changes Colours!" -# -# +try: + OS = file('/etc/SuSE-release').read().split('\n')[0].strip() +except IOError: + OS = "It's a Lizard man!, It changes Colours!" + + #For Debian #try: #this is a bit of a kludge, as /etc/debian-release is ++++++ smolt-1.1.1.1-desktop_file.patch ++++++ --- client/smolt.desktop +++ client/smolt.desktop @@ -4,8 +4,8 @@ GenericName=Smolt Desktop Profiler Comment=View and send a hardware profile to the Fedora Project Exec=smoltGui -Icon=smolt.png +Icon=smolt Terminal=false Type=Application -Categories=System; +Categories=System;Monitor; Version=0.9.7 ++++++ smolt-1.1.1.1-make_install.patch ++++++ --- 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 @@ 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/ - 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 /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 /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-0.9.8.3.tar.bz2 -> smolt-1.1.1.1.tar.bz2 ++++++ ++++ 44814 lines of diff (skipped) ++++++ smolt-0.9.8.3-uuidfile_path.patch -> smolt-1.1.1.1-uuidfile_path.patch ++++++ --- smolt/smolt-0.9.8.3-uuidfile_path.patch 2007-07-24 18:51:09.000000000 +0200 +++ /mounts/work_src_done/NOARCH/smolt/smolt-1.1.1.1-uuidfile_path.patch 2008-04-03 13:20:26.000000000 +0200 @@ -1,28 +1,124 @@ +--- client/config.py ++++ client/config.py +@@ -16,7 +16,7 @@ + except IOError: + OS = "Shadowman!" + +-HW_UUID = "/etc/sysconfig/hw-uuid" ++HW_UUID = "/etc/smolt/uuid" + + #These are the defaults taken from the source code. + #fs_types = get_config_attr("FS_TYPES", ["ext2", "ext3", "xfs", "reiserfs"]) +--- client/makeuuid.py ++++ client/makeuuid.py +@@ -23,7 +23,7 @@ + help=_('force makeuuid to generate a new UUID even when one exists')) + parser.add_option('-o', '--output', + dest='uuid_file', +- default='/etc/sysconfig/hw-uuid', ++ default='/etc/smolt/uuid', + help=_('the uuid file')) + parser.add_option('-s', '--secure', + dest='secure', +--- client/po/bg.po ++++ client/po/bg.po +@@ -178,7 +178,7 @@ + msgstr "" + "Данните бяха успешно изпратени. Ако Ви дотрябва справка за вашия хардуерен профил за рапорт за грешка вашия UUID е \n" + "%s\n" +-"записан в /etc/sysconfig/hw-uuid" ++"записан в /etc/smolt/uuid" + + #: smoltGui.py:166 + msgid "Smolt Privacy Policy" +--- client/po/hr.po ++++ client/po/hr.po +@@ -177,7 +177,7 @@ + msgstr "" + "Podaci su uspješno poslati. Ako vam tijekom izrade prijave o nedostatku zatreba pozivanje na vaš profil hardvera, vaš UUID je \n" + "%s,\n" +-"a pohranjen je u datoteci /etc/sysconfig/hw-uuid" ++"a pohranjen je u datoteci /etc/smolt/uuid" + + #: smoltGui.py:166 + msgid "Smolt Privacy Policy" +--- client/po/hu.po ++++ client/po/hu.po +@@ -178,7 +178,7 @@ + msgstr "" + "Az adatokat sikerült elküldeni. Ha utalni kell az ön hardverprofiljára egy hibabejelentéskor, az ön UUID-je:\n" + "%s\n" +-"eltárolva /etc/sysconfig/hw-uuid fájlban" ++"eltárolva /etc/smolt/uuid fájlban" + + #: smoltGui.py:166 + msgid "Smolt Privacy Policy" +--- client/po/it.po ++++ client/po/it.po +@@ -179,7 +179,7 @@ + msgstr "" + "I dati sono stati inviati con successo. Se si desidera fare riferimento al proprio profilo hardware per una segnalazione d'errore il vostro UUID è \n" + "%s\n" +-"salvato in /etc/sysconfig/hw-uuid" ++"salvato in /etc/smolt/uuid" + + #: smoltGui.py:166 + msgid "Smolt Privacy Policy" +--- client/po/or.po ++++ client/po/or.po +@@ -180,7 +180,7 @@ + msgstr "" + "ତଥ୍ଯକୁ ସଫଳତାର ସହିତ ପଠାଗଲା। ଯଦି ଆପଣ ଗୋଟିଏ ତୃଟି ବିବରଣୀ ପାଇଁ ଆପଣଙ୍କ ହାର୍ଡୱେର ରୂପରେଖକୁ ଦେଖିବା ପାଇଁ ଚାହୁଁଛନ୍ତି ତାହାହେଲେ \n" + "ଆପଣଙ୍କ UUID ଟି ହେଲା %s\n" +-"ଏହାକୁ /etc/sysconfig/hw-uuid ରେ ରଖାଯାଇଛି" ++"ଏହାକୁ /e/etc/smolt.u/uid ରେ ରଖାଯାଇଛି" + + #: smoltGui.py:166 + msgid "Smolt Privacy Policy" +--- client/po/ru.po ++++ client/po/ru.po +@@ -179,7 +179,7 @@ + msgstr "" + "Данные успешно отправлены. Для ссылки на свой профиль оборудования при сообщении об ошибках используйте UUID\n" + "%s,\n" +-"он сохранен в /etc/sysconfig/hw-uuid" ++"он сохранен в /etc/smolt/uuid" + + #: smoltGui.py:166 + msgid "Smolt Privacy Policy" +--- client/po/zh_CN.po ++++ client/po/zh_CN.po +@@ -179,7 +179,7 @@ + "%s\n" + "stored in %s" + msgstr "" +-"数据被成功地发送了。如果您需要为 bug 报告而引用您的硬件配置,存放在 /etc/sysconfig/hw-uuid 的 UUID 是\n" ++"数据被成功地发送了。如果您需要为 bug 报告而引用您的硬件配置,存放在 /etc/smolt/uuid 的 UUID 是\n" + "%s\n" + "。" + --- client/smolt.py +++ client/smolt.py -@@ -838,12 +838,12 @@ +@@ -58,7 +58,7 @@ + + smoonURL = get_config_attr("SMOON_URL", "http://smolts.org/") + secure = get_config_attr("SECURE", 0) +-hw_uuid_file = get_config_attr("HW_UUID", "/etc/sysconfig/hw-uuid") ++hw_uuid_file = get_config_attr("HW_UUID", "/etc/smolt/uuid") + smoltProtocol = '0.97' + supported_protocols = ['0.97',] + user_agent = 'smolt/%s' % smoltProtocol +--- client/smoltFirstBoot.py ++++ client/smoltFirstBoot.py +@@ -102,9 +102,9 @@ - def getUUID(): - try: -- UUID = file('/etc/sysconfig/hw-uuid').read().strip() -+ UUID = file('/etc/smolt.uuid').read().strip() - except IOError: - try: - UUID = file('/proc/sys/kernel/random/uuid').read().strip() - try: -- file('/etc/sysconfig/hw-uuid', 'w').write(self.UUID) -+ file('/etc/smolt.uuid', 'w').write(self.UUID) - except: - sys.stderr.write('Unable to save UUID, continuing...\n') - except IOError: ---- client/smoltGui.py -+++ client/smoltGui.py -@@ -132,7 +132,7 @@ - gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_MODAL, - gtk.MESSAGE_INFO, - gtk.BUTTONS_OK, -- message_format=_('The data was successfully sent. If you need to refer to your hardware profile for a bug report your UUID is \n%s\nstored in /etc/sysconfig/hw-uuid') % self.profile.host.UUID) -+ message_format=_('The data was successfully sent. If you need to refer to your hardware profile for a bug report your UUID is \n%s\nstored in /etc/smolt.uuid') % self.profile.host.UUID) - finishMessage.show() - finishMessage.run() - self.quit_cb(None) + iter = text_buffer.get_iter_at_offset(0) + # Generate the UUID if it does not exist yet +- if not os.path.exists('/etc/sysconfig/hw-uuid'): ++ if not os.path.exists('/etc/smolt/uuid'): + s=open('/proc/sys/kernel/random/uuid', 'r') +- d=open('/etc/sysconfig/hw-uuid','w') ++ d=open('/etc/smolt/uuid','w') + d.write(s.read()) + s.close() + d.close() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org