up to 0.6.2.19

diff --git a/make.patch b/make.patch
deleted file mode 100644 (file)
index 2f4f66a..0000000
--- a/make.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- psensor-0.4.4/Makefile     2013-02-08 14:25:54.022571318 +0200
-+++ psensor-0.4.4/Makefile     2013-02-08 14:27:49.654581619 +0200
-@@ -1,6 +1,8 @@
- # Released under GPLv2 license terms, read LICENSE file
- 
- PREFIX=/usr
-+LIB=lib
-+LIBDIR=$(PREFIX)/$(LIB)
- 
- CC=gcc
- 
-@@ -25,11 +27,11 @@
- OBJS=main.o graph.o psensor.o ui_sensorlist.o config.o color.o hdd.o ui_color.o
- 
- # uncomments for compilation with nvidia thermal sensor support
--#LD_OPTS+= /usr/lib/libXNVCtrl.a
--#OBJS+= nvidia.o
--#CC_D+= -D NVIDIA_SUPPORT
-+LD_OPTS+= $(LIBDIR)/libXNVCtrl.a
-+OBJS+= nvidia.o
-+CC_D+= -D NVIDIA_SUPPORT
- 
--CC_OPTS=-Wall -O3 `pkg-config --cflags --libs ${PKG_CONFIG_LIBRARIES}` ${CC_D} 
-+CC_OPTS=$(OPTFLAGS) `pkg-config --cflags --libs ${PKG_CONFIG_LIBRARIES}` ${CC_D} 
- 
- ################### PSensor Server ######################
- 
-@@ -38,11 +40,11 @@
- LD_OPTS_SERVER= -lsensors
- 
- # uncomments for compilation with nvidia thermal sensor support
--#OBJS_SERVER+= nvidia.o 
--#CC_D_SERVER+= -D NVIDIA_SUPPORT
--#LD_OPTS_SERVER+= -lX11 -lXext /usr/lib/libXNVCtrl.a
-+OBJS_SERVER+= nvidia.o 
-+CC_D_SERVER+= -D NVIDIA_SUPPORT
-+LD_OPTS_SERVER+= -lX11 -lXext $(LIBDIR)/libXNVCtrl.a
- 
--CC_OPTS_SERVER=-Wall -O3 ${CC_D_SERVER}
-+CC_OPTS_SERVER=$(OPTFLAGS) ${CC_D_SERVER}
- 
- all:psensor psensor-server
- 

diff --git a/psensor.spec b/psensor.spec
index 4d6447b36ec4d05498b383a5f14c5b4503115a92..faca53e2b77e41764a16f35c714f174e8e6c2439 100644 (file)
--- a/psensor.spec
+++ b/psensor.spec
@@ -1,13 +1,12 @@
 Summary:       A Graphical Temperature Monitor
 Name:          psensor
-Version:       0.4.4
+Version:       0.6.2.19
 Release:       1
 License:       GPL v2
 Group:         X11/Applications
 URL:           http://wpitchoune.net/psensor
-Source0:       http://wpitchoune.net/psensor/files/%{name}-%{version}-src.tar.gz
-# Source0-md5: 6765f61fa2b0c4118e88b0771e628130
-Patch0:                make.patch
+Source0:       http://wpitchoune.net/psensor/files/%{name}-%{version}.tar.gz
+# Source0-md5: ddc21cbb36c6c622f7b5c1c7eb277374
 BuildRequires: GConf2-devel
 BuildRequires: cairo-devel
 BuildRequires: gcc
@@ -15,9 +14,10 @@ BuildRequires:       gtk+2-devel
 BuildRequires: libXNVCtrl-devel
 BuildRequires: lm_sensors-devel
 Requires:      desktop-file-utils
+Requires:      gtk-update-icon-cache
 Requires:      hddtemp
+Requires:      hicolor-icon-theme
 Requires:      lm_sensors
-ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -32,36 +32,44 @@ It is based on:
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%{__make} \
-       LIB=%{_lib} \
-       CC="%{__cc}" \
-       OPTFLAGS="%{rpmcflags}"
+%configure
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{_desktopdir}}
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
-install -Dp %{name} $RPM_BUILD_ROOT%{_bindir}
-install -Dp %{name}-server $RPM_BUILD_ROOT%{_bindir}
-cp -p %{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}
-cp -p %{name}-32x32.png $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
+
+%find_lang %{name}
+
+# unsupported themes, or size. remove
+%{__rm} -r $RPM_BUILD_ROOT%{_iconsdir}/ubuntu-mono-dark
+%{__rm} -r $RPM_BUILD_ROOT%{_iconsdir}/ubuntu-mono-light
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/14x14
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_desktop_database
+%update_icon_cache hicolor
 
 %postun
 %update_desktop_database
+%update_icon_cache hicolor
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc LICENSE CHANGES README
-%attr(755,root,root) %{_bindir}/%{name}
-%attr(755,root,root) %{_bindir}/%{name}-server
+%doc AUTHORS NEWS README
+%attr(755,root,root) %{_bindir}/psensor
+%attr(755,root,root) %{_bindir}/psensor-server
+%{_mandir}/man1/psensor-server.1*
+%{_mandir}/man1/psensor.1*
+/etc/xdg/autostart/psensor.desktop
+%{_desktopdir}/psensor.desktop
+%{_iconsdir}/hicolor/*/apps/psensor*.*
 %{_datadir}/%{name}
-%{_desktopdir}/%{name}.desktop