[xfce4-sensors-plugin] Update to 1.2.3 Remove all patches, they have been upstreamed

[Christoph Wickert]

commit 0a9bdfc744937e15f397357f0531825f0525c11b
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun Jul 3 17:16:24 2011 +0200

    Update to 1.2.3
    Remove all patches, they have been upstreamed

 xfce4-sensors-plugin-1.0.0-acpi-info.patch         |   13 --
 xfce4-sensors-plugin-1.0.0-battery.patch           |   53 -----
 ...-plugin-1.0.0-configure-help-acpi-default.patch |   22 --
 xfce4-sensors-plugin-1.0.0-dso.patch               |  211 --------------------
 xfce4-sensors-plugin-1.0.0-gcc.patch               |   10 -
 xfce4-sensors-plugin-1.0.0-libnotify-0.7.0.patch   |   24 ---
 xfce4-sensors-plugin-1.0.0-underlink.patch         |   36 ----
 xfce4-sensors-plugin.spec                          |   57 ++----
 8 files changed, 17 insertions(+), 409 deletions(-)
---
diff --git a/xfce4-sensors-plugin.spec b/xfce4-sensors-plugin.spec
index 2639b16..d2f4d32 100644
--- a/xfce4-sensors-plugin.spec
+++ b/xfce4-sensors-plugin.spec
@@ -1,31 +1,16 @@
 # Review at https://bugzilla.redhat.com/show_bug.cgi?id=173552
 
+%global minor_version 1.2
+
 Name:           xfce4-sensors-plugin
-Version:        1.0.0
-Release:        4%{?dist}
+Version:        1.2.3
+Release:        1%{?dist}
 Summary:        Sensors plugin for the Xfce panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/1.0/%{name}-%{version}.tar.bz2
-Patch0:         xfce4-sensors-plugin-1.0.0-dso.patch
-Patch1:         xfce4-sensors-plugin-1.0.0-libnotify-0.7.0.patch
-# Fixes underlinking in panel-plugin and src
-# http://bugzilla.xfce.org/show_bug.cgi?id=7095
-Patch2:         xfce4-sensors-plugin-1.0.0-underlink.patch
-# Fixes FTBFS due to incorrect compiler flags
-# https://bugzilla.redhat.com/show_bug.cgi?id=715838
-Patch3:         xfce4-sensors-plugin-1.0.0-gcc.patch
-# Fixes display of ACPI version
-# http://bugzilla.xfce.org/show_bug.cgi?id=6956
-Patch4:         xfce4-sensors-plugin-1.0.0-acpi-info.patch
-# Use correct units for battery state
-# http://bugzilla.xfce.org/show_bug.cgi?id=6959
-Patch5:         xfce4-sensors-plugin-1.0.0-battery.patch
-# Fix wrong default values in configure help
-# http://bugzilla.xfce.org/show_bug.cgi?id=6960
-Patch6:         xfce4-sensors-plugin-1.0.0-configure-help-acpi-default.patch
+Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xfce4-panel-devel >= 4.4.0
@@ -57,22 +42,9 @@ Static libraries and header files for the xfce4-sensors-plugin.
 
 %prep
 %setup -q
-%patch0 -p1 -b .dsofix
-%if 0%{?fedora} >= 15
-%patch1 -p1 -b .libnotify-0.7.0
-%endif
-%patch2 -p1 -b .gcc
-%patch3 -p1 -b .underlink
-%patch4 -p1 -b .acpi
-%patch5 -p1 -b .battery
-%patch6 -p1 -b .configure-help
 
 
 %build
-# Xfce has its own autotools-running-script thingy, if you use autoreconf
-# it'll fall apart horribly
-xdt-autogen
-
 %configure --disable-static \
         --enable-sysfsacpi=yes \
         --with-pathhddtemp=%{_bindir}/hddtemp \
@@ -83,11 +55,15 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+
 %find_lang %{name}
+
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-desktop-file-install --vendor ""                                \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --delete-original                                       \
+desktop-file-install --vendor "" \
+        --add-category "System" \
+        --remove-category "Utility" \
+        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+        --delete-original \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-sensors.desktop
 
 
@@ -129,13 +105,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Jul 03 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.
+* Sun Jul 03 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.2.3-1
+- Update to 1.2.3
+- Remove all patches, they have been upstreamed
+
+* Sun Jul 03 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-4
 - Fix FTBFS. Thanks to Johannes Lips for the patch (#715838)
 - Improve ACPI support. Thanks to Raphael Groner for the patches (#661933)
 
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
 * Fri Jan 14 2011 Adam Williamson <awilliam at redhat.com> - 1.0.0-3
 - fix some underlinking against xfcegui and xfcepanel (fixes build)