[packages/mate-power-manager] move applets and ui files to mate-panel dirs

[glen]

commit b318a16c3f2d3f51b280caecb6b820ce880ab1f8
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Mar 2 20:00:24 2013 +0200

    move applets and ui files to mate-panel dirs

 mate-power-manager.spec | 28 ++++++++++++++--------------
 uidir.patch             | 22 ++++++++++++++++++++++
 2 files changed, 36 insertions(+), 14 deletions(-)
---
diff --git a/mate-power-manager.spec b/mate-power-manager.spec
index 09f9f11..2276826 100644
--- a/mate-power-manager.spec
+++ b/mate-power-manager.spec
@@ -14,6 +14,7 @@ Patch0:		bashism.patch
 Patch1:		use-gnome-keyring.patch
 Patch2:		use-libnotify.patch
 Patch3:		systemd-fallback.patch
+Patch4:		uidir.patch
 URL:		http://wiki.mate-desktop.org/mate-power-manager
 BuildRequires:	cairo-devel >= 1.0.0
 BuildRequires:	dbus-glib-devel
@@ -39,11 +40,13 @@ BuildRequires:	xz
 Requires:	glib2 >= 1:2.26.0
 Requires:	gtk-update-icon-cache
 Requires:	hicolor-icon-theme
-Requires:	mate-panel
+Requires:	mate-panel >= 1.5.0
 Requires:	upower
 Suggests:	udisks
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_libexecdir	%{_libdir}/mate-panel
+
 %description
 MATE Power Manager uses the information and facilities provided by
 UPower displaying icons and handling user callbacks in an interactive
@@ -55,6 +58,7 @@ MATE session.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 NOCONFIGURE=1 ./autogen.sh
@@ -96,31 +100,27 @@ rm -rf $RPM_BUILD_ROOT
 %files  -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS README
+/etc/xdg/autostart/mate-power-manager.desktop
 %attr(755,root,root) %{_bindir}/mate-power-bugreport.sh
 %attr(755,root,root) %{_bindir}/mate-power-manager
 %attr(755,root,root) %{_bindir}/mate-power-preferences
 %attr(755,root,root) %{_bindir}/mate-power-statistics
 %attr(755,root,root) %{_sbindir}/mate-power-backlight-helper
-%attr(755,root,root) %{_libdir}/mate-brightness-applet
-%attr(755,root,root) %{_libdir}/mate-inhibit-applet
+%attr(755,root,root) %{_libdir}/mate-panel/mate-brightness-applet
+%attr(755,root,root) %{_libdir}/mate-panel/mate-inhibit-applet
 %{_mandir}/man1/mate-power-manager.1*
 %{_mandir}/man1/mate-power-preferences.1*
 %{_mandir}/man1/mate-power-statistics.1*
-/etc/xdg/autostart/mate-power-manager.desktop
+%{_datadir}/%{name}
 %{_desktopdir}/mate-power-preferences.desktop
 %{_desktopdir}/mate-power-statistics.desktop
 %{_iconsdir}/hicolor/*/apps/mate-*.*
+%{_datadir}/mate-panel/applets/org.mate.BrightnessApplet.mate-panel-applet
+%{_datadir}/mate-panel/applets/org.mate.InhibitApplet.mate-panel-applet
+%{_datadir}/mate-panel/ui/brightness-applet-menu.xml
+%{_datadir}/mate-panel/ui/inhibit-applet-menu.xml
 %{_datadir}/dbus-1/services/mate-power-manager.service
 %{_datadir}/dbus-1/services/org.mate.panel.applet.BrightnessAppletFactory.service
 %{_datadir}/dbus-1/services/org.mate.panel.applet.InhibitAppletFactory.service
-%{_datadir}/%{name}
-%{_datadir}/polkit-1/actions/org.mate.power.policy
-%{_datadir}/mate-2.0/ui/brightness-applet-menu.xml
-%{_datadir}/mate-2.0/ui/inhibit-applet-menu.xml
-%{_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
-
-# XXX proper dir
-%dir %{_datadir}/mate-2.0
-%dir %{_datadir}/mate-2.0/ui
+%{_datadir}/polkit-1/actions/org.mate.power.policy
diff --git a/uidir.patch b/uidir.patch
new file mode 100644
index 0000000..72711a8
--- /dev/null
+++ b/uidir.patch
@@ -0,0 +1,22 @@
+--- mate-power-manager-1.5.1/applets/brightness/Makefile.am~	2013-03-02 19:33:45.000000000 +0200
++++ mate-power-manager-1.5.1/applets/brightness/Makefile.am	2013-03-02 19:35:13.858468368 +0200
+@@ -60,7 +60,7 @@
+             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+             $< > $@
+ 
+-uidir   = $(datadir)/mate-2.0/ui
++uidir   = $(datadir)/mate-panel/ui
+ ui_DATA = brightness-applet-menu.xml
+ 
+ EXTRA_DIST = org.mate.BrightnessApplet.mate-panel-applet.in.in $(ui_DATA) $(service_in_files)
+--- mate-power-manager-1.5.1/applets/inhibit/Makefile.am~	2013-03-02 19:33:45.000000000 +0200
++++ mate-power-manager-1.5.1/applets/inhibit/Makefile.am	2013-03-02 19:37:05.210279694 +0200
+@@ -59,7 +59,7 @@
+             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+             $< > $@
+ 
+-uidir   = $(datadir)/mate-2.0/ui
++uidir   = $(datadir)/mate-panel/ui
+ ui_DATA = inhibit-applet-menu.xml
+ 
+ EXTRA_DIST = org.mate.InhibitApplet.mate-panel-applet.in.in $(ui_DATA) $(service_in_files)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mate-power-manager.git/commitdiff/5e5c651d8d289e987c036fca630da845036815e1