- updated to 0.20

- changed Source0 and URL
- cosmetics/simplifications

Changed files:
    gDesklets-SysInfo.spec -> 1.7

diff --git a/gDesklets-SysInfo.spec b/gDesklets-SysInfo.spec
index 81328ea30a1cd7605b3256ae6df4dcbd5e5e0860..869a7911adf1412e48172d8fbf9aa0b41d6c0d05 100644 (file)
--- a/gDesklets-SysInfo.spec
+++ b/gDesklets-SysInfo.spec
@@ -2,20 +2,23 @@
 Summary:       A sensor and a display for system status meters
 Summary(pl):   Czujnik i wy¶wietlacz dla pomiarów stanu systemu
 Name:          gDesklets-%{pname}
-Version:       0.11
-Release:       2
+Version:       0.20
+Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://www.pycage.de/download/gdesklets/sysinfo-desklet-%{version}.tar.bz2
-# Source0-md5: ef1b78d4699c31a719a301db131580d8
-URL:           http://www.pycage.de/software_gdesklets.html
+Source0:       http://gdesklets.gnomedesktop.org/files/%{pname}-%{version}.tar.bz2
+# Source0-md5: 56227e4f5d2d648d0e94ad38ca6473b4
+URL:           http://gdesklets.gnomedesktop.org/categories.php?func=gd_show_app&gd_app_id=39
 Buildrequires: python >= 2.3
-Buildrequires: python-pygtk >= 1.99.14
+Buildrequires: python-pygtk >= 2.0.0
 Requires:      gDesklets
 Provides:      gDesklets-display
 Provides:      gDesklets-sensor
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define        _sensorsdir     %{_datadir}/gdesklets/Sensors
+%define        _displaysdir    %{_datadir}/gdesklets/Displays
+
 %description
 A sensor and a display for system status meters.
 
@@ -23,29 +26,27 @@ A sensor and a display for system status meters.
 Czujnik i wy¶wietlacz dla pomiarów stanu systemu.
 
 %prep
-%setup -q -n sysinfo-desklet-%{version}
+%setup -q -c -n %{pname}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/gdesklets/{Sensors,Displays/%{pname}}
-
-./Install_SysInfo_Sensor.bin --nomsg \
-       $RPM_BUILD_ROOT%{_datadir}/gdesklets/Sensors
+install -d $RPM_BUILD_ROOT{%{_sensorsdir},%{_displaysdir}/%{pname}}
 
-cp -R gfx *.display $RPM_BUILD_ROOT%{_datadir}/gdesklets/Displays/%{pname}
+./Install_sysinfo_Sensor.bin --nomsg \
+       $RPM_BUILD_ROOT%{_sensorsdir}
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gdesklets/Sensors/%{pname}/{CVS,gfx/CVS,.#*}
+cp -R %{pname}/{gfx,*.display} $RPM_BUILD_ROOT%{_displaysdir}/%{pname}
+mv $RPM_BUILD_ROOT%{_sensorsdir}/sysinfo $RPM_BUILD_ROOT%{_sensorsdir}/SysInfo
 
-%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
 
 %files
 %defattr(644,root,root,755)
-%doc README
-%{_datadir}/gdesklets/Sensors/*
-%{_datadir}/gdesklets/Displays/*
+%{_sensorsdir}/*
+%{_displaysdir}/*