- updated to 0.11

- cleanups

Changed files:
    gDesklets-StarterBar.spec -> 1.3

diff --git a/gDesklets-StarterBar.spec b/gDesklets-StarterBar.spec
index ba4e8265429233ff5817460876e85963b947ae83..8e01eb0fc1787f66fa2c176d141d24e7b11bcc61 100644 (file)
--- a/gDesklets-StarterBar.spec
+++ b/gDesklets-StarterBar.spec
@@ -1,19 +1,22 @@
 %define        pname   StarterBar
-%define        pver    0_1
 Summary:       An icon bar for GNOME
 Summary(pl):   Pasek na ikony dla GNOME
 Name:          gDesklets-%{pname}
-Version:       0.1
+Version:       0.11
 Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://www.pycage.de/download/gdesklets/%{pname}-%{pver}.tar.bz2
-# Source0-md5: 47ddce700300f59a6fdfc2d619fb66a8
+Source0:       http://www.pycage.de/download/gdesklets/starterbar-desklet-%{version}.tar.bz2
+# Source0-md5: 4a9143a5d24d78f5fd1d9a5c7a72c2b8
 URL:           http://www.pycage.de/software_gdesklets.html
 Buildrequires: python >= 2.3
+BuildRequires: python-pygtk >= 1.99.14
 Requires:      gDesklets
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define        _sensorsdir     %{_datadir}/gdesklets/Sensors
+%define        _displaysdir    %{_datadir}/gdesklets/Displays
+
 %description
 An icon bar for GNOME. You can do the same with the GNOME panel, but
 this one is pure eye candy.
@@ -23,20 +26,21 @@ Pasek na ikony dla GNOME. Takie mo
 ten jest mi³y dla oka.
 
 %prep
-%setup -q -n %{pname}
-tail -c 10240 Install_StarterBar_Sensor.bin 2>&1 | tar -xz 2>&1
+%setup -q -n starterbar-desklet-%{version}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/gdesklets/{Sensors,Displays/%{pname}}
+install -d $RPM_BUILD_ROOT{%{_sensorsdir},%{_displaysdir}/%{pname}}
+
+./Install_%{pname}_Sensor.bin --nomsg \
+       $RPM_BUILD_ROOT%{_sensorsdir}
 
-cp -R StarterBar $RPM_BUILD_ROOT%{_datadir}/gdesklets/Sensors
-cp -R gfx *.display $RPM_BUILD_ROOT%{_datadir}/gdesklets/Displays/%{pname}
+cp -R gfx *.display $RPM_BUILD_ROOT%{_displaysdir}/%{pname}
 
-%py_comp $RPM_BUILD_ROOT%{_datadir}/gdesklets/Sensors
-%py_ocomp $RPM_BUILD_ROOT%{_datadir}/gdesklets/Sensors
+%py_comp $RPM_BUILD_ROOT%{_sensorsdir}
+%py_ocomp $RPM_BUILD_ROOT%{_sensorsdir}
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/gdesklets/Sensors/*/*.py
+rm -f $RPM_BUILD_ROOT%{_sensorsdir}/*/*.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,5 +48,5 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README
-%{_datadir}/gdesklets/Sensors/*
-%{_datadir}/gdesklets/Displays/*
+%{_sensorsdir}/*
+%{_displaysdir}/*