[mate-power-manager] update to latest git snapshot

leigh123linux leigh123linux at fedoraproject.org
Mon Oct 29 21:37:17 UTC 2012


commit 7790bbfcf5cb8f365a3d92cb0e4b78f8c3010517
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Oct 29 21:37:07 2012 +0000

    update to latest git snapshot

 .gitignore                   |    1 +
 mate-power-manager.spec      |   30 +++++++++++++++++++++---------
 panelapplet_versionfix.patch |   11 +++++++++++
 sources                      |    2 +-
 4 files changed, 34 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4084163..d2fb980 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /mate-power-manager-1.4.0.tar.xz
+/mate-power-manager-1.4.1.git543b06f.tar.gz
diff --git a/mate-power-manager.spec b/mate-power-manager.spec
index 6a55a78..0a14984 100644
--- a/mate-power-manager.spec
+++ b/mate-power-manager.spec
@@ -1,11 +1,18 @@
+%global        _internal_version  543b06f
+
 Name:           mate-power-manager
-Version:        1.4.0
-Release:        2%{?dist}
+Version:        1.4.1
+Release:        0.1.git543b06f%{?dist}
 Summary:        MATE power management service
 
 License:        GPLv2+
 URL:            http://pub.mate-desktop.org
-Source0:        http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+# To generate tarball
+# wget https://github.com/mate-desktop/mate-power-manager/tarball/%%{_internal_version} -O mate-power-manager-1.4.1.git%%{_internal_version}.tar.gz
+Source0:        http://leigh123linux.fedorapeople.org/pub/mate-power-manager/source/mate-power-manager-%{version}.git%{_internal_version}.tar.gz
+#Source0:       http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+
+Patch0:         panelapplet_versionfix.patch 
 
 BuildRequires: mate-panel-devel
 BuildRequires: popt-devel
@@ -37,7 +44,8 @@ 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
+%setup -q -n mate-desktop-%{name}-%{_internal_version}
+%patch0 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 
@@ -92,21 +100,25 @@ fi
 %{_sysconfdir}/mateconf/schemas/mate-*.schemas
 %{_sysconfdir}/xdg/autostart/mate-*.desktop
 %{_datadir}/applications/mate-*.desktop
-%{_datadir}/dbus-1/services/mate-power-manager.service
+%{_datadir}/dbus-1/services/*.service
 %{_datadir}/mate-power-manager/
 %{_datadir}/icons/hicolor/*/apps/mate-*.*
 %{_datadir}/polkit-1/actions/org.mate.power.policy
 %{_datadir}/mate/help/mate-power-manager/
-%{_datadir}/mate-2.0/ui/MATE_BrightnessApplet.xml
-%{_datadir}/mate-2.0/ui/MATE_InhibitApplet.xml
-%{_libdir}/matecomponent/servers/MATE_BrightnessApplet.server
-%{_libdir}/matecomponent/servers/MATE_InhibitApplet.server
+%{_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
 %{_libexecdir}/mate-brightness-applet
 %{_libexecdir}/mate-inhibit-applet
 %{_mandir}/man1/*.1.*
 
 
 %changelog
+* Mon Oct 29 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.1.git543b06f
+- update to latest git snapshot
+- patch to build against latest mate-panel
+
 * Fri Oct 19 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-2
 - add V=1 to make command
 - add mate-conf requires and remove mate-icon-theme
diff --git a/panelapplet_versionfix.patch b/panelapplet_versionfix.patch
new file mode 100644
index 0000000..9313d5d
--- /dev/null
+++ b/panelapplet_versionfix.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -281,7 +281,7 @@ have_applets=no
+ if test x$enable_applets = xyes ; then
+     have_applets=yes
+ 
+-    PKG_CHECK_MODULES(PANEL, [libmatepanelapplet-3.0 >= $LIBPANEL_REQUIRED])
++    PKG_CHECK_MODULES(PANEL, [libmatepanelapplet-4.0 >= $LIBPANEL_REQUIRED])
+     AC_DEFINE(HAVE_APPLETS, 1, [Define if we are building applets])
+ fi
+ AC_MSG_RESULT([$have_applets])
diff --git a/sources b/sources
index e176e87..cea44c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c073efb67474ee87ab60eb5d891748e  mate-power-manager-1.4.0.tar.xz
+d0d69981ca264b1d783efc27c2ea3d81  mate-power-manager-1.4.1.git543b06f.tar.gz


More information about the scm-commits mailing list