Hello community, here is the log from the commit of package smolt for openSUSE:Factory checked in at Tue Mar 15 14:26:10 CET 2011. -------- --- smolt/smolt.changes 2011-03-11 09:21:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/smolt/smolt.changes 2011-03-15 12:20:23.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Mar 15 10:10:14 UTC 2011 - puzel@novell.com + +- update to smolt-1.4.3 + - no longer requires hal + - adds distro interface + - sugar control panel +- drop dependency on hal +- use spec-cleaner +- add smolt-pci_ids-path.patch +- update smolt-1.4.2.2-make_install.patch +- drop smolt-add-rootfs-to-profile.patch (in upstream) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- smolt-1.4.2.2.tar.bz2 smolt-add-rootfs-to-profile.patch New: ---- smolt-1.4.3.tar.bz2 smolt-pci_ids-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smolt.spec ++++++ --- /var/tmp/diff_new_pack.9WwQZ8/_old 2011-03-15 14:25:01.000000000 +0100 +++ /var/tmp/diff_new_pack.9WwQZ8/_new 2011-03-15 14:25:01.000000000 +0100 @@ -18,23 +18,28 @@ Name: smolt -Summary: Hardware Profiler -Version: 1.4.2.2 -Release: 8 +Version: 1.4.3 +Release: 1 License: GPLv3+ +Summary: Hardware Profiler +Url: https://fedorahosted.org/smolt/ Group: Hardware/Other -Url: https://hosted.fedoraproject.org/projects/smolt/ Source0: %{name}-%{version}.tar.bz2 Source1: smolt.init Patch1: smolt-1.1.1.1-desktop_file.patch -Patch2: smolt-%version-make_install.patch -Patch3: smolt-add-rootfs-to-profile.patch +Patch2: smolt-1.4.2.2-make_install.patch +Patch3: smolt-pci_ids-path.patch +BuildRequires: fdupes +BuildRequires: gettext +BuildRequires: update-desktop-files +PreReq: /bin/cat +PreReq: coreutils +Requires: cron +Requires: dbus-1-python +Requires: python-simplejson +Requires: python-urlgrabber BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Requires: dbus-1-python python-urlgrabber cron python-simplejson -Requires: hal -BuildRequires: fdupes gettext update-desktop-files -PreReq: /bin/cat coreutils %description The smolt hardware profiler is a server-client system that does a @@ -45,14 +50,14 @@ This package contains the smolt client - %package -n smolt-gui -Summary: Smolt GUI License: GPLv3+ +Summary: Smolt GUI Group: Hardware/Other -Requires: %{name} = %{version} python-qt4 -Supplements: packageand(python-qt4:smolt) +Requires: %{name} = %{version} +Requires: python-qt4 Recommends: ksmolt +Supplements: packageand(python-qt4:smolt) %description -n smolt-gui The smolt hardware profiler is a server-client system that does a @@ -63,7 +68,6 @@ This package contains the smolt client gui - %prep %setup -q %patch1 @@ -77,18 +81,18 @@ %install pushd client -make DESTDIR=$RPM_BUILD_ROOT install -install -D -m 755 %{S:1} %{buildroot}/%{_initrddir}/smolt -ln -s %{_initrddir}/smolt %{buildroot}/%_bindir/rcsmolt +%make_install +install -D -m 755 %{S:1} %{buildroot}/%{_initddir}/smolt +ln -s %{_initddir}/smolt %{buildroot}/%{_bindir}/rcsmolt touch %{buildroot}/%{_sysconfdir}/smolt/hw-uuid -rm -rf %{buildroot}/usr/share/locale/sr@latin %{buildroot}/usr/share/locale/default -rm -rf %{buildroot}/usr/share/smolt/client/smoltFirstBoot.py +rm -rf %{buildroot}%{_datadir}/locale/sr@latin %{buildroot}%{_datadir}/locale/default +rm -rf %{buildroot}%{_datadir}/smolt/client/smoltFirstBoot.py popd %fdupes %{buildroot} -%suse_update_desktop_file -G "Desktop Profiler" %name -%find_lang %name -mkdir -p %buildroot/var/run -touch %buildroot/var/run/smolt_do_opensuse_run +%suse_update_desktop_file -G "Desktop Profiler" %{name} +%find_lang %{name} +mkdir -p %{buildroot}%{_localstatedir}/run +touch %{buildroot}%{_localstatedir}/run/smolt_do_opensuse_run %clean rm -rf %{buildroot} @@ -128,7 +132,7 @@ %{_bindir}/smoltDeleteProfile %{_bindir}/smoltSendProfile %config %{_sysconfdir}/cron.d/%{name} -%{_initrddir}/%{name} +%{_initddir}/%{name} %{_datadir}/%{name}/client/__init__.py %{_datadir}/%{name}/client/config.py %{_datadir}/%{name}/client/deleteProfile.py @@ -142,10 +146,16 @@ %{_datadir}/%{name}/client/smolt_config.py %{_datadir}/%{name}/client/software.py %{_datadir}/%{name}/client/uuiddb.py +%{_datadir}/%{name}/client/MultipartPostHandler.py +%{_datadir}/%{name}/client/smolt_mythtv.py +%{_datadir}/%{name}/client/devicelist.py +%{_datadir}/%{name}/client/hwdata.py +%{_datadir}/sugar +%{_datadir}/%{name}/client/distros %{_datadir}/%{name}/doc/PrivacyPolicy %{_mandir}/man1/smoltDeleteProfile.1.gz %{_mandir}/man1/smoltSendProfile.1.gz -%ghost /var/run/smolt_do_opensuse_run +%ghost %{_localstatedir}/run/smolt_do_opensuse_run %files -n smolt-gui %defattr(-,root,root) ++++++ smolt-1.4.2.2-make_install.patch ++++++ --- /var/tmp/diff_new_pack.9WwQZ8/_old 2011-03-15 14:25:01.000000000 +0100 +++ /var/tmp/diff_new_pack.9WwQZ8/_new 2011-03-15 14:25:01.000000000 +0100 @@ -1,18 +1,38 @@ ---- client/Makefile +Index: client/Makefile +=================================================================== +--- client/Makefile.orig +++ client/Makefile -@@ -71,14 +71,12 @@ +@@ -1,7 +1,7 @@ + PO_FILES=$(wildcard po/*.po) + MO_FILES=$(patsubst %.po,%.mo,$(PO_FILES)) + # echo PY_FILES=$(ls -1 *.py | grep -v '^\(create_monthly\|getLink\|haldump\|hammer_add\|makeuuid\|starhscale\).py$' | sort) +-PY_FILES=config.py deleteProfile.py fs_util.py gate.py gui.py i18n.py __init__.py MultipartPostHandler.py os_detect.py privacypolicy.py scan.py sendProfile.py smolt_config.py smoltFirstBoot.py smoltGui.py smolt_mythtv.py smolt.py software.py uuiddb.py ++PY_FILES=config.py deleteProfile.py fs_util.py gate.py gui.py i18n.py __init__.py MultipartPostHandler.py os_detect.py privacypolicy.py scan.py sendProfile.py smolt_config.py smoltFirstBoot.py smoltGui.py smolt_mythtv.py smolt.py software.py uuiddb.py devicelist.py hwdata.py + DIRED_MO_FILES=$(patsubst po/%.mo,mo/%/LC_MESSAGES/$(NAME).mo,$(MO_FILES)) + + +@@ -55,6 +55,7 @@ install-main: move-mo + install -D -m 0644 icons/smolt.png $(DATADIR)/$(NAME)/client/icons/smolt.png + cp -adv $(PY_FILES) $(DATADIR)/$(NAME)/client/ + cp -adv sugar/* $(DATADIR)/sugar/extensions/cpsection/smolt/ ++ cp -adv distros $(DATADIR)/$(NAME)/client/ + + mkdir -p $(DATADIR)/icons/hicolor/16x16/apps/ + mkdir -p $(DATADIR)/icons/hicolor/22x22/apps/ +@@ -70,14 +71,12 @@ install-main: move-mo mkdir -p $(_DOCDIR) install -p -m 0644 ../doc/PrivacyPolicy $(_DOCDIR) - gzip -c -9 man/smoltSendProfile.1 > $(_MANDIR)/man1/smoltSendProfile.1.gz - gzip -c -9 man/smoltDeleteProfile.1 > $(_MANDIR)/man1/smoltDeleteProfile.1.gz - gzip -c -9 man/smoltGui.1 > $(_MANDIR)/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 - ln -sf $(DATADIR)/$(NAME)/client/smoltGui.py $(BINDIR)/smoltGui - ln -sf $(SMOLTCONFIGDIR)/config.py $(DATADIR)/$(NAME)/client/config.py ++ cp man/* $(DATADIR)/man/man1/ ++ + 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 ++++++ smolt-1.4.2.2.tar.bz2 -> smolt-1.4.3.tar.bz2 ++++++ ++++ 31601 lines of diff (skipped) ++++++ smolt-pci_ids-path.patch ++++++ Index: smolt-1.4.3/client/hwdata.py =================================================================== --- smolt-1.4.3.orig/client/hwdata.py +++ smolt-1.4.3/client/hwdata.py @@ -20,7 +20,7 @@ class DeviceMap: self.vendors['usb'] = self.device_map('usb') def device_map(self, bus='pci'): - fn = "/usr/share/hwdata/%s.ids" % bus + fn = "/usr/share/%s.ids" % bus fo = open(fn, 'r') vendors = {} curvendor = None ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org