[mate-power-manager] rework specfile to be cleaner and easier to read with with nmarques

[Dan Mashal]

commit df87176f19cb732f7f65df4efcf432b1dff45705
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Fri Dec 21 19:08:09 2012 -0800

    rework specfile to be cleaner and easier to read with with nmarques

 mate-power-manager.spec |   88 +++++++++++++++++++++++------------------------
 1 files changed, 43 insertions(+), 45 deletions(-)
---
diff --git a/mate-power-manager.spec b/mate-power-manager.spec
index e7118cc..726e057 100644
--- a/mate-power-manager.spec
+++ b/mate-power-manager.spec
@@ -1,42 +1,39 @@
-Name:           mate-power-manager
-Version:        1.5.1
-Release:        4%{?dist}
-Summary:        MATE power management service
+Name:          mate-power-manager
+Version:       1.5.1
+Release:       5%{?dist}
+Summary:       MATE power management service
+License:       GPLv2+
+URL:           http://pub.mate-desktop.org
+Source0:       http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
+
+# fix crasher; add inhibit for systemd >= 195, upstreamed
+# https://github.com/mate-desktop/mate-power-manager/pull/43
+Patch0: %{name}-1.5.1-add_systemd_checks.patch
 
-License:        GPLv2+
-URL:            http://pub.mate-desktop.org
-Source0:        http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
-
-# PATCH-FIX-UPSTREAM - systemd inhibit requires systemd >= 195, adding checks
-# fixes crasher, https://github.com/mate-desktop/mate-power-manager/pull/43
-Patch0:         %{name}-1.5.1-add_systemd_checks.patch
-
-BuildRequires: mate-panel-devel
-BuildRequires: popt-devel
-BuildRequires: mate-doc-utils
-BuildRequires: desktop-file-utils
 BuildRequires: cairo-devel
+BuildRequires: dbus-glib-devel
+BuildRequires: desktop-file-utils
 BuildRequires: libcanberra-devel
 BuildRequires: libmatenotify-devel
-BuildRequires: upower-devel
-BuildRequires: unique-devel
 BuildRequires: glib2-devel
-BuildRequires: rarian-compat
 BuildRequires: gtk2-devel
-BuildRequires: dbus-glib-devel
-BuildRequires: mate-control-center-devel
 BuildRequires: mate-common
+BuildRequires: mate-control-center-devel
+BuildRequires: mate-doc-utils
 BuildRequires: mate-keyring-devel
+BuildRequires: mate-panel-devel
+BuildRequires: popt-devel
+BuildRequires: rarian-compat
 BuildRequires: systemd-devel
-BuildRequires: mate-panel-libs
+BuildRequires: unique-devel
+BuildRequires: upower-devel
 
-Requires: dbus-x11
-Requires: mate-panel-libs
 
 %description
 MATE Power Manager uses the information and facilities provided by UPower
 displaying icons and handling user callbacks in an interactive MATE session.
 
+
 %prep
 %setup -q
 %patch0 -p1
@@ -44,24 +41,20 @@ NOCONFIGURE=1 ./autogen.sh
 
 
 %build
-%configure \
-        --disable-static \
-        --disable-scrollkeeper \
-        --enable-applets
-
+%configure  --disable-static --disable-scrollkeeper --enable-applets
 make V=1 %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-
-desktop-file-install --delete-original             \
-  --remove-category=MATE                           \
-  --add-category=X-Mate                            \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications    \
-  $RPM_BUILD_ROOT%{_datadir}/applications/mate-*.desktop
+make DESTDIR=%{buildroot} install
+%find_lang %{name} --all-name
+desktop-file-install                               \
+     --delete-original                             \
+     --remove-category=MATE                        \
+     --add-category=X-Mate                         \
+     --dir=%{buildroot}%{_datadir}/applications    \
+%{buildroot}%{_datadir}/applications/*.desktop
 
-%find_lang %{name} --with-gnome
 
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
@@ -79,12 +72,15 @@ fi
 /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
-
 %files  -f %{name}.lang
 %doc AUTHORS COPYING README
-%{_bindir}/*
-%{_sbindir}/*
-%{_sysconfdir}/xdg/autostart/mate-*.desktop
+%{_mandir}/man1/*.gz
+%{_bindir}/mate-power-bugreport.sh
+%{_bindir}/mate-power-manager
+%{_bindir}/mate-power-preferences
+%{_bindir}/mate-power-statistics
+%{_sbindir}/mate-power-backlight-helper
+%{_datadir}/omf/mate-power-manager/
 %{_datadir}/applications/mate-*.desktop
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/mate-power-manager/
@@ -96,14 +92,17 @@ fi
 %{_datadir}/mate-panel/applets/org.mate.BrightnessApplet.mate-panel-applet
 %{_datadir}/mate-panel/applets/org.mate.InhibitApplet.mate-panel-applet
 %{_datadir}/glib-2.0/schemas/org.mate.power-manager.gschema.xml
+%{_sysconfdir}/xdg/autostart/mate-power-manager.desktop
 %{_libexecdir}/mate-brightness-applet
 %{_libexecdir}/mate-inhibit-applet
-%{_mandir}/man1/*.1.*
-
 
 %changelog
+* Fri Dec 21 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.5.1-5
+- Rework specfile to make it easier to read and pretty.
+- Drop duplicate BRs
+
 * Thu Nov 29 2012 Nelson Marques <nmo.marques at gmail.com> - 1.5.1-4
-- Add %name-1.5.1-add_systemd_checks.patch - fixes crasher,
+- Add %%name-1.5.1-add_systemd_checks.patch - fixes crasher,
   systemd inhibit requires systemd >= 195, merged upstream
 
 * Mon Nov 26 2012 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.1-3
@@ -132,4 +131,3 @@ fi
 
 * Fri Oct 19 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-1
 - Initial build
-