# TODO
# - cpufreq applet does not start
-# - modemlights applet (currently disabled in configure.ac)
#
# Conditional build:
-%bcond_without mucharmap # Mucharmap (character map) support in charpicker applet
-%bcond_with timerapplet # Timer applet (requires Python binding from MATE <= 1.4)
+%bcond_without gucharmap # Gucharmap (character map) support in charpicker applet
Summary: Small applications which embed themselves in the MATE panel
Summary(pl.UTF-8): Aplety MATE - małe aplikacje osadzające się w panelu
Summary(ru.UTF-8): Маленькие программы, встраивающиеся в панель MATE
Summary(uk.UTF-8): Маленькі програми, що вбудовуються в панель MATE
Name: mate-applets
-Version: 1.6.2
-Release: 2
+Version: 1.8.0
+Release: 1
License: GPL v2+ (applets), FDL (help)
Group: X11/Applications
-Source0: http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
-# Source0-md5: 7a83557afd1a71940cb623d92788ecc4
+Source0: http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
+# Source0-md5: ae144e7ef848eb31d814bda1ccafa17a
# check paths in Makefile before removing it!
Patch0: m4_fix.patch
Patch1: uidir.patch
-Patch2: use-libwnck.patch
URL: https://github.com/mate-desktop/mate-applets
BuildRequires: NetworkManager-devel >= 0.7
BuildRequires: autoconf >= 2.59
BuildRequires: gettext-devel >= 0.10.40
BuildRequires: glib2-devel >= 1:2.26.0
BuildRequires: gtk+2-devel >= 2:2.20.0
+BuildRequires: gtksourceview2-devel
BuildRequires: intltool >= 0.40.0
BuildRequires: libgtop-devel >= 1:2.11.92
BuildRequires: libmateweather-devel >= 1.6.1
BuildRequires: libtool >= 1:1.4.3
BuildRequires: libwnck2-devel >= 2.9.3
BuildRequires: libxml2-devel >= 1:2.5.0
-%{?with_mucharmap:BuildRequires: mate-character-map-devel >= 1.5.0}
+%{?with_gucharmap:BuildRequires: gucharmap2-devel >= 2.32.1}
BuildRequires: mate-common >= 1.1.0
BuildRequires: mate-desktop-devel >= 1.1.0
-BuildRequires: mate-doc-utils >= 1.1.0
BuildRequires: mate-icon-theme-devel >= 1.1.0
BuildRequires: mate-panel-devel >= 1.5.2
BuildRequires: pkgconfig >= 1:0.19
BuildRequires: upower-devel >= 0.9.4
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xz
-%{!?with_mucharmap:BuildConflicts: mate-character-map-devel}
+BuildRequires: yelp-tools
Requires: mate-icon-theme
# sr@Latn vs. sr@latin
Conflicts: glibc-misc < 6:2.7
Requires: glib2 >= 1:2.26.0
Requires: gtk+2 >= 2:2.20.0
Requires: hicolor-icon-theme
-%{?with_mucharmap:Requires: mate-character-map >= 1.5.0}
Requires: mate-panel >= 1.5.2
%description -n mate-applet-charpicker
Paleta znaków obsługuje kodowanie znaków UTF-8, więc można jej używać
do wyświetlania lub kopiowania dowolnych znaków unikodowych.
+%package -n mate-applet-command
+Summary: Command applet for MATE Desktop
+Group: X11/Applications
+Requires: %{name} = %{version}-%{release}
+Requires: glib2 >= 1:2.26.0
+Requires: gtk+2 >= 2:2.20.0
+Requires: hicolor-icon-theme
+Requires: mate-panel >= 1.5.2
+
+%description -n mate-applet-command
+Command applet for MATE Desktop.
+
%package -n mate-applet-cpufreq
Summary: CPU Frequency Scaling Monitor applet for MATE Desktop
Summary(pl.UTF-8): Aplet monitora częstotliwości procesora dla środowiska MATE
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%{__sed} -i -e '1s,/usr/bin/env python,/usr/bin/python,' \
- invest-applet/invest/{invest-applet.py,mate-invest-chart} \
- timer-applet/src/timer-applet
+ invest-applet/invest/{chart.py,invest-applet.py,mate-invest-chart}
%build
-mate-doc-prepare --copy --force
%{__intltoolize}
%{__libtoolize}
%{__aclocal} -I m4
--enable-networkmanager \
--disable-schemas-compile \
--disable-static \
- %{?with_timerapplet:--enable-timer-applet}
+ --enable-timer-applet
%{__make}
# mate < 1.5 did not exist in pld, avoid dependency on mate-conf
%{__rm} $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/stickynotes-applet.convert
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/cmn
%py_postclean
%postun -n mate-applet-charpicker
%update_icon_cache hicolor
+%post -n mate-applet-command
+%glib_compile_schemas
+
+%preun -n mate-applet-command
+%glib_compile_schemas
+
%post -n mate-applet-cpufreq
%glib_compile_schemas
%update_icon_cache hicolor
%postun -n mate-applet-stickynotes
%update_icon_cache hicolor
+%post -n mate-applet-timer
+%glib_compile_schemas
+
+%preun -n mate-applet-timer
+%glib_compile_schemas
+
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
%{_datadir}/mate-panel/applets/org.mate.applets.CharpickerApplet.mate-panel-applet
%{_datadir}/mate-panel/ui/charpick-applet-menu.xml
+%files -n mate-applet-command
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/command-applet
+%{_datadir}/dbus-1/services/org.mate.panel.applet.CommandAppletFactory.service
+%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.command.gschema.xml
+%{_datadir}/mate-panel/applets/org.mate.applets.CommandApplet.mate-panel-applet
+
%files -n mate-applet-cpufreq -f mate-cpufreq-applet.lang
%defattr(644,root,root,755)
# selector
%{_pixmapsdir}/mate-stickynotes
%{_iconsdir}/hicolor/*/apps/mate-sticky-notes-applet.*
-%if %{with timerapplet}
%files -n mate-applet-timer
%defattr(644,root,root,755)
-%doc timer-applet/AUTHORS
%attr(755,root,root) %{_libexecdir}/timer-applet
-%dir %{_libdir}/matecomponent
-%dir %{_libdir}/matecomponent/servers
-%dir %{_libdir}/matecomponent/servers/TimerApplet.server
-%{_datadir}/mate-applets/TimerApplet.xml
-%{_datadir}/mate-applets/timer-applet.glade
-%{py_sitedir}/timerapplet
-%{_pixmapsdir}/timer-applet.png
-%endif
+%{_datadir}/dbus-1/services/org.mate.panel.applet.TimerAppletFactory.service
+%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.timer.gschema.xml
+%{_datadir}/mate-panel/applets/org.mate.applets.TimerApplet.mate-panel-applet
%files -n mate-applet-trash -f mate-trashapplet.lang
%defattr(644,root,root,755)
---- mate-applets-1.5.2/./modemlights/Makefile.am~ 2013-03-08 02:20:01.000000000 +0200
-+++ mate-applets-1.5.2/./modemlights/Makefile.am 2013-03-14 19:59:47.806812372 +0200
-@@ -14,7 +14,7 @@
- $(MATE_APPLETS4_LIBS) \
- $(MODEMLIGHTS_LIBS)
-
--uidir = $(datadir)/mate-2.0/ui
-+uidir = $(datadir)/mate-panel/ui
- ui_DATA = modem-applet-menu.xml
-
-
--- mate-applets-1.5.2/./battstat/Makefile.am~ 2013-03-08 02:20:01.000000000 +0200
+++ mate-applets-1.5.2/./battstat/Makefile.am 2013-03-14 20:00:10.041169347 +0200
@@ -91,7 +91,7 @@
+++ /dev/null
-reverse patch of:
-
-From c9b9454068f090a7132c6bea6ac07c91843ffb6e Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano@karapetsas.com>
-Date: Fri, 8 Jun 2012 17:56:47 +0200
-Subject: [PATCH] port to libmatewnck
-
-diff --git a/README b/README
-index f9677f5..f60a6d4 100644
---- a/README
-+++ b/README
-@@ -27,7 +27,7 @@ You need at least:
- scroll-keeper-0.1.4
- libglade-2.4.0
- libxklavier-1.13
-- libmatewnck
-+ libwnck-2.10.0
- system-tools-backends-1.1.3
- libgtop-2.12.0
-
-diff --git a/configure.in b/configure.in
-index 32e4be9..0c1b0a5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@ LIBPANEL_REQUIRED=1.1.0
- LIBPANEL3_REQUIRED=1.1.0
- LIBGTOP_REQUIRED=2.11.92
- LIBXKLAVIER_REQUIRED=4.0
--LIBMATEWNCK_REQUIRED=1.3.0
-+LIBWNCK_REQUIRED=2.9.3
- LIBMATE_DESKTOP_REQUIRED=1.1.0
- LIBMATENOTIFY_REQUIRED=1.1.0
- HAL_REQUIRED=0.5.3
-@@ -152,12 +152,12 @@ fi
- AC_SUBST(MATE_SETTINGS_DAEMON_CFLAGS)
- AC_SUBST(MATE_SETTINGS_DAEMON_LIBS)
-
--dnl -- check for libmatewnck (required) -------------------------------------------
--PKG_CHECK_MODULES(LIBMATEWNCK, libmatewnck >= $LIBMATEWNCK_REQUIRED,,
-- AC_MSG_ERROR([libmatewnck is required to build mate-applets.], 1))
-+dnl -- check for libwnck (required) -------------------------------------------
-+PKG_CHECK_MODULES(LIBWNCK, libwnck-1.0 >= $LIBWNCK_REQUIRED,,
-+ AC_MSG_ERROR([libwnck is required to build mate-applets.], 1))
-
--AC_SUBST(LIBMATEWNCK_CFLAGS)
--AC_SUBST(LIBMATEWNCK_LIBS)
-+AC_SUBST(LIBWNCK_CFLAGS)
-+AC_SUBST(LIBWNCK_LIBS)
-
- dnl -- check for libmatenotify (optional) -----------------------------------------
- LIBMATENOTIFY_CFLAGS=
---- mate-applets-1.5.2/stickynotes/Makefile.am~ 2013-03-14 20:56:12.000000000 +0200
-+++ mate-applets-1.5.2/stickynotes/Makefile.am 2013-03-14 20:57:16.245627828 +0200
-@@ -13,7 +13,7 @@
- -I. \
- -I$(srcdir) \
- $(MATE_APPLETS4_CFLAGS) \
-- $(LIBMATEWNCK_CFLAGS) \
-+ $(LIBWNCK_CFLAGS) \
- $(XML2_CFLAGS) \
- -DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\"\
- -DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/mate-stickynotes/\"
-@@ -34,7 +34,7 @@
-
- stickynotes_applet_LDADD = \
- $(MATE_APPLETS4_LIBS) \
-- $(LIBMATEWNCK_LIBS) \
-+ $(LIBWNCK_LIBS) \
- $(XML2_LIBS) \
- -lX11
-
-diff --git a/stickynotes/stickynotes.c b/stickynotes/stickynotes.c
-index 418115b..1144862 100644
---- a/stickynotes/stickynotes.c
-+++ b/stickynotes/stickynotes.c
-@@ -21,7 +21,8 @@
- #include <libxml/parser.h>
- #include <X11/Xatom.h>
- #include <gdk/gdkx.h>
--#include <libmatewnck/libmatewnck.h>
-+#define WNCK_I_KNOW_THIS_IS_UNSTABLE 1
-+#include <libwnck/libwnck.h>
- #include <string.h>
-
- #include "stickynotes.h"
-@@ -36,7 +37,7 @@ static gboolean save_scheduled = FALSE;
-
- static void response_cb (GtkWidget *dialog, gint id, gpointer data);
-
--/* Based on a function found in matewnck */
-+/* Based on a function found in wnck */
- static void
- set_icon_geometry (GdkWindow *window,
- int x,
-@@ -661,23 +662,23 @@ stickynote_set_visible (StickyNote *note, gboolean visible)
- else if (note->workspace > 0)
- {
- #if 0
-- MatewnckWorkspace *matewnck_ws;
-+ WnckWorkspace *wnck_ws;
- gulong xid;
-- MatewnckWindow *matewnck_win;
-- MatewnckScreen *matewnck_screen;
-+ WnckWindow *wnck_win;
-+ WnckScreen *wnck_screen;
-
- g_print ("set_visible(): workspace = %i\n",
- note->workspace);
-
- xid = GDK_WINDOW_XID (note->w_window->window);
-- matewnck_screen = matewnck_screen_get_default ();
-- matewnck_win = matewnck_window_get (xid);
-- matewnck_ws = matewnck_screen_get_workspace (
-- matewnck_screen,
-+ wnck_screen = wnck_screen_get_default ();
-+ wnck_win = wnck_window_get (xid);
-+ wnck_ws = wnck_screen_get_workspace (
-+ wnck_screen,
- note->workspace - 1);
-- if (matewnck_win && matewnck_ws)
-- matewnck_window_move_to_workspace (
-- matewnck_win, matewnck_ws);
-+ if (wnck_win && wnck_ws)
-+ wnck_window_move_to_workspace (
-+ wnck_win, wnck_ws);
- else
- g_print ("set_visible(): errr\n");
- #endif
-@@ -744,7 +745,7 @@ void stickynotes_remove(StickyNote *note)
- gboolean
- stickynotes_save_now (void)
- {
-- MatewnckScreen *matewnck_screen;
-+ WnckScreen *wnck_screen;
- const gchar *title;
- GtkTextBuffer *buffer;
- GtkTextIter start, end;
-@@ -759,12 +760,12 @@ stickynotes_save_now (void)
- xmlDocSetRootElement(doc, root);
- xmlNewProp(root, XML_CHAR("version"), XML_CHAR (VERSION));
-
-- matewnck_screen = matewnck_screen_get_default ();
-- matewnck_screen_force_update (matewnck_screen);
-+ wnck_screen = wnck_screen_get_default ();
-+ wnck_screen_force_update (wnck_screen);
-
- /* For all sticky notes */
- for (i = 0; i < g_list_length(stickynotes->notes); i++) {
-- MatewnckWindow *matewnck_win;
-+ WnckWindow *wnck_win;
- gulong xid = 0;
-
- /* Access the current note in the list */
-@@ -758,13 +758,13 @@
- gchar *y_str = g_strdup_printf("%d", note->y);
-
- xid = GDK_WINDOW_XID (gtk_widget_get_window (note->w_window));
-- matewnck_win = matewnck_window_get (xid);
-+ wnck_win = wnck_window_get (xid);
-
- if (!g_settings_get_boolean (stickynotes->settings, "sticky") &&
-- matewnck_win)
-+ wnck_win)
- note->workspace = 1 +
-- matewnck_workspace_get_number (
-- matewnck_window_get_workspace (matewnck_win));
-+ wnck_workspace_get_number (
-+ wnck_window_get_workspace (wnck_win));
- else
- note->workspace = 0;
-
-@@ -875,7 +876,7 @@ stickynotes_load (GdkScreen *screen)
- xmlDocPtr doc = NULL;
- xmlNodePtr root;
- xmlNodePtr node;
-- /* MatewnckScreen *matewnck_screen; */
-+ /* WnckScreen *wnck_screen; */
- GList *new_notes, *tmp1; /* Lists of StickyNote*'s */
- GList *new_nodes; /* Lists of xmlNodePtr's */
- int x, y, w, h;
-@@ -1063,8 +1064,8 @@ stickynotes_load (GdkScreen *screen)
-
- tmp1 = new_notes;
- /*
-- matewnck_screen = matewnck_screen_get_default ();
-- matewnck_screen_force_update (matewnck_screen);
-+ wnck_screen = wnck_screen_get_default ();
-+ wnck_screen_force_update (wnck_screen);
- */
-
- while (tmp1)
-diff --git a/stickynotes/stickynotes.h b/stickynotes/stickynotes.h
-index 2e2f3b3..0e64c73 100644
---- a/stickynotes/stickynotes.h
-+++ b/stickynotes/stickynotes.h
-@@ -20,7 +20,8 @@
- #ifndef __STICKYNOTES_H__
- #define __STICKYNOTES_H__
-
--#include <libmatewnck/libmatewnck.h>
-+#define WNCK_I_KNOW_THIS_IS_UNSTABLE 1
-+#include <libwnck/libwnck.h>
- #include <stickynotes_applet.h>
-
- typedef struct
projects / packages / mate-applets.git / commitdiff