[gnome-applet-sensors] - Latest upstream, works with gnome 3 - Disable nvidia plugin, as it needs newer libs, not in fedora

[Huzaifa Sidhpurwala]

commit 957a2c5ae9d61f42bc7ab715cbd0580f7b11eadd
Author: Huzaifa Sidhpurwala <huzaifas at redhat.com>
Date:   Wed Dec 14 13:31:33 2011 +0530

    - Latest upstream, works with gnome 3
    - Disable nvidia plugin, as it needs newer libs, not in fedora yet
    - Disable RPATH

 .gitignore                             |    1 +
 gnome-applet-sensors.spec              |   27 ++++++++++++++-------------
 sensors-applet-2.2.7-libnotify07.patch |   26 --------------------------
 sensors-applet-fixDSO.patch            |   12 ------------
 sources                                |    2 +-
 5 files changed, 16 insertions(+), 52 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a33cdef..768c82c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 sensors-applet-2.2.4.tar.gz
 sensors-applet-2.2.7.tar.gz
+/sensors-applet-3.0.0.tar.gz
diff --git a/gnome-applet-sensors.spec b/gnome-applet-sensors.spec
index fcca824..663f810 100644
--- a/gnome-applet-sensors.spec
+++ b/gnome-applet-sensors.spec
@@ -1,17 +1,15 @@
 Name:           gnome-applet-sensors
-Version:        2.2.7
-Release:        5%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 Summary:        Gnome panel applet for hardware sensors
 Group:          User Interface/Desktops
 License:        GPLv2+ and CC-BY-SA
 URL:            http://sensors-applet.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sensors-applet/sensors-applet-%{version}.tar.gz
-Patch0:		sensors-applet-fixDSO.patch
-Patch1:         sensors-applet-2.2.7-libnotify07.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gnome-panel-devel >= 2.8
 BuildRequires:  gettext gnome-doc-utils lm_sensors-devel libnotify-devel
-BuildRequires:  libXNVCtrl-devel intltool perl-XML-Parser scrollkeeper
+BuildRequires:  intltool perl-XML-Parser scrollkeeper
 BuildRequires:	libatasmart-devel
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -42,10 +40,6 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n sensors-applet-%{version}
-%patch0 -p1 -b .fixdso 
-%if 0%{?fedora} > 14
-%patch1 -p1 -b .libnotify07
-%endif
 chmod -x %{_builddir}/sensors-applet-%{version}/AUTHORS
 chmod -x %{_builddir}/sensors-applet-%{version}/NEWS
 chmod -x %{_builddir}/sensors-applet-%{version}/TODO
@@ -53,8 +47,9 @@ chmod -x %{_builddir}/sensors-applet-%{version}/ChangeLog
 
 
 %build
-%configure --disable-scrollkeeper --disable-static \
-  --enable-libnotify --with-nvidia
+%configure --disable-scrollkeeper --disable-static --enable-libnotify
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 
@@ -90,12 +85,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/sensors-applet
 %{_libdir}/libsensors-applet-plugin.so.*
 %{_libdir}/sensors-applet/
-%{_libdir}/bonobo/servers/*.server
-%{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/omf/sensors-applet/
 %{_datadir}/gnome/help/sensors-applet/
 %{_datadir}/pixmaps/sensors-applet/
 %{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/sensors-applet/ui/SensorsApplet.xml
+%{_datadir}/gnome-panel/4.0/applets/org.gnome.applets.SensorsApplet.panel-applet
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.SensorsAppletFactory.service
 
 %files devel
 %defattr(-,root,root,-)
@@ -104,6 +100,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 14 2011 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 3.0.0-1
+- Latest upstream, works with gnome 3
+- Disable nvidia plugin, as it needs newer libs, not in fedora yet
+- Disable RPATH
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index a3ed730..d8b8002 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f342fab98be4f1b9a25af0689af20130  sensors-applet-2.2.7.tar.gz
+425078fc1ff5a98af1547e039002a73f  sensors-applet-3.0.0.tar.gz