X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ups-monitor.spec;fp=ups-monitor.spec;h=30845c16467a04dc475f98e611985904cfa60844;hb=72685b988a7f92d10c70c32e11ba48e9badf2181;hp=5596198dce5272740e87ac88a11f594430621688;hpb=d510ef6fb60990aecd7559ad5bfb2498f92b980b;p=packages%2Fups-monitor.git

diff --git a/ups-monitor.spec b/ups-monitor.spec
index 5596198..30845c1 100644
--- a/ups-monitor.spec
+++ b/ups-monitor.spec
@@ -1,19 +1,17 @@
-%define prefix /usr
-
 Summary:        A graphical UPS monitor for the GNOME desktop
-Summary(pl):	Graficzny monitor UPSa dla ¶rodowiska GNOME.
+Summary(pl):	Graficzny monitor UPS-a dla ¶rodowiska GNOME
 Name:           ups-monitor
 Vendor:         Amauta
 Version:        0.1 
 Release:       	0.1 
 License:        GPL
 Group:          System/Monitoring
-Source:         http://freshmeat.net/redir/ups-monitor/51922/url_tgz/ups-monitor-0.1.tar.gz
+Source:         http://freshmeat.net/redir/ups-monitor/51922/url_tgz/%{name}-%{version}.tar.gz
 URL:            http://www.amautacorp.com/
 Requires:       python-pygtk >= 2.0.0
 Requires:	python-pygtk-glade >= 2.0.0
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/build-%{name}-%{ver}
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 UPS monitor is a graphical application that lets you monitor your UPS
@@ -23,37 +21,31 @@ UPS monitor requires a working Network UPS Tools (nut) server.
 
 %description -l pl
 UPS monitor jest graficzn± aplikacj± pozwalaj±c± monitorowaæ UPS w czasie
-rzeczywistym. Obs³guje zarówno lokalny jak i sieciowy UPS.
+rzeczywistym. Obs³uguje zarówno lokalny jak i sieciowy UPS.
 
 UPS monitor wymaga serwer Network UPS Tools (nut).
 
 %prep
-rm -rf $RPM_BUILD_ROOT
-%setup
+%setup -q
 
 
 %install
-install -D -m 755 ups-monitor $RPM_BUILD_ROOT/%{_bindir}/ups-monitor
-install -D -m 644 ups-monitor.glade $RPM_BUILD_ROOT/%{_datadir}/ups-monitor/ups-monitor.glade
-install -D -m 644 ups-monitor.gladep $RPM_BUILD_ROOT/%{_datadir}/ups-monitor/ups-monitor.gladep
-install -D -m 644 battery-level.png $RPM_BUILD_ROOT/%{_datadir}/ups-monitor/battery-level.png
-install -D -m 644 load.png $RPM_BUILD_ROOT/%{_datadir}/ups-monitor/load.png
-install -D -m 644 remaining-time.png $RPM_BUILD_ROOT/%{_datadir}/ups-monitor/remaining-time.png
-install -D -m 644 ups-monitor.png $RPM_BUILD_ROOT/%{_datadir}/ups-monitor/ups-monitor.png
-install -D -m 644 ups-monitor.png $RPM_BUILD_ROOT/%{_pixmapsdir}/ups-monitor.png
-install -D -m 644 ups-monitor.desktop  $RPM_BUILD_ROOT/%{_applnkdir}/Utilities/ups-monitor.desktop 
-
+rm -rf $RPM_BUILD_ROOT
 
+install -D -m 755 ups-monitor $RPM_BUILD_ROOT%{_bindir}/ups-monitor
+install -D -m 644 ups-monitor.glade $RPM_BUILD_ROOT%{_datadir}/ups-monitor/ups-monitor.glade
+install -D -m 644 ups-monitor.gladep $RPM_BUILD_ROOT%{_datadir}/ups-monitor/ups-monitor.gladep
+install -D -m 644 battery-level.png $RPM_BUILD_ROOT%{_datadir}/ups-monitor/battery-level.png
+install -D -m 644 load.png $RPM_BUILD_ROOT%{_datadir}/ups-monitor/load.png
+install -D -m 644 remaining-time.png $RPM_BUILD_ROOT%{_datadir}/ups-monitor/remaining-time.png
+install -D -m 644 ups-monitor.png $RPM_BUILD_ROOT%{_datadir}/ups-monitor/ups-monitor.png
+install -D -m 644 ups-monitor.png $RPM_BUILD_ROOT%{_pixmapsdir}/ups-monitor.png
+install -D -m 644 ups-monitor.desktop  $RPM_BUILD_ROOT%{_desktopdir}/ups-monitor.desktop
 
 %files
 %defattr(644,root,root,755)
 %doc README TODO version
 %attr(755,root,root) %{_bindir}/ups-monitor
-%{_datadir}/ups-monitor/ups-monitor.glade
-%{_datadir}/ups-monitor/ups-monitor.gladep
-%{_datadir}/ups-monitor/battery-level.png
-%{_datadir}/ups-monitor/load.png
-%{_datadir}/ups-monitor/remaining-time.png
-%{_datadir}/ups-monitor/ups-monitor.png
+%{_datadir}/ups-monitor
 %{_pixmapsdir}/ups-monitor.png
-%{_applnkdir}/Utilities/ups-monitor.desktop
+%{_desktopdir}/ups-monitor.desktop