- up to 1.8.0

- libwnck support added upstream (use-libwnck.patch removed)

diff --git a/mate-notification-daemon.spec b/mate-notification-daemon.spec
index 98a003dee40f6e44ce5b2fc11dedae93ec74e9f2..9ea6926b768d62b3f8b80a269c9647e5a711a9ea 100644 (file)
--- a/mate-notification-daemon.spec
+++ b/mate-notification-daemon.spec
@@ -8,20 +8,19 @@
 Summary:       Notification daemon for MATE Desktop
 Summary(pl.UTF-8):     Demon powiadomień dla środowiska MATE Desktop
 Name:          mate-notification-daemon
-Version:       1.6.1
+Version:       1.8.0
 Release:       1
 License:       GPL v2+
 Group:         Applications/System
-Source0:       http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
-# Source0-md5: 1c4eb6137fab8d83a15e1d68d0f865ea
-Patch1:                use-libwnck.patch
+Source0:       http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
+# Source0-md5: f9cb50a86c30bccc8728adcbf6a04f32
 URL:           http://wiki.mate-desktop.org/mate-notification-daemon
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.10
 BuildRequires: dbus-devel >= 0.78
 BuildRequires: dbus-glib-devel >= 0.78
 BuildRequires: desktop-file-utils
-BuildRequires: gdk-pixbuf2-devel >= 2.0
+BuildRequires: gdk-pixbuf2-devel >= 2.18.0
 BuildRequires: gettext-devel >= 0.11
 BuildRequires: glib2-devel >= 1:2.26.0
 %{!?with_gtk3:BuildRequires:   gtk+2-devel >= 2:2.18.0}
@@ -30,9 +29,9 @@ BuildRequires:        intltool >= 0.40.0
 BuildRequires: libcanberra-devel
 BuildRequires: libcanberra-gtk-devel >= 0.4
 BuildRequires: libtool >= 2:2.2.6
-BuildRequires: libwnck2-devel >= 1.0
+%{!?with_gtk3:BuildRequires:   libwnck2-devel}
+%{?with_gtk3:BuildRequires:    libwnck-devel >= 3.0.0}
 BuildRequires: mate-common
-BuildRequires: mate-doc-utils
 BuildRequires: pkgconfig
 BuildRequires: tar >= 1:1.22
 BuildRequires: xorg-lib-libX11-devel
@@ -63,7 +62,6 @@ Demon powiadomień dla środowiska MATE Desktop.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -91,6 +89,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/mate-notification-daemon.convert
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/engines/lib*.la
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/cmn
 
 desktop-file-install \
        --remove-category="MATE" \

diff --git a/use-libwnck.patch b/use-libwnck.patch
deleted file mode 100644 (file)
index 108111a..0000000
--- a/use-libwnck.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- mate-notification-daemon-1.5.0/configure.ac.0001   2013-02-17 02:52:47.604932539 +0100
-+++ mate-notification-daemon-1.5.0/configure.ac        2013-02-17 02:52:47.636932246 +0100
-@@ -123,7 +123,7 @@ pkg_modules="
-       dbus-1 >= $REQ_DBUS_VERSION, \
-       dbus-glib-1 >= $REQ_DBUS_VERSION, \
-         libcanberra-gtk >= $REQ_LIBCANBERRA_GTK_VERSION, \
--      libmatewnck \
-+      libwnck-1.0 \
-         x11 \
- "
- PKG_CHECK_MODULES(NOTIFICATION_DAEMON, $pkg_modules)
---- mate-notification-daemon-1.5.2/src/daemon/daemon.c~        2013-03-11 12:55:15.000000000 +0200
-+++ mate-notification-daemon-1.5.2/src/daemon/daemon.c 2013-03-11 12:58:19.295122631 +0200
-@@ -42,7 +42,8 @@
- #include <X11/Xatom.h>
- #include <gdk/gdkx.h>
- 
--#include <libmatewnck/libmatewnck.h>
-+#define WNCK_I_KNOW_THIS_IS_UNSTABLE
-+#include <libwnck/libwnck.h>
- 
- #include "daemon.h"
- #include "engines.h"
-@@ -1148,36 +1148,36 @@
- 
- static gboolean fullscreen_window_exists(GtkWidget* nw)
- {
--      MatewnckScreen* matewnck_screen;
--      MatewnckWorkspace* matewnck_workspace;
-+      WnckScreen* matewnck_screen;
-+      WnckWorkspace* matewnck_workspace;
-       GList* l;
- 
-       #if (GDK_PIXBUF_MAJOR == 2) && (GDK_PIXBUF_MINOR < 22)
--              matewnck_screen = matewnck_screen_get(GDK_SCREEN_XNUMBER(gdk_window_get_screen(gtk_widget_get_window(nw))));
-+              matewnck_screen = wnck_screen_get(GDK_SCREEN_XNUMBER(gdk_window_get_screen(gtk_widget_get_window(nw))));
-       #else
--              matewnck_screen = matewnck_screen_get(GDK_SCREEN_XNUMBER(gdk_drawable_get_screen(GDK_DRAWABLE(GTK_WIDGET(nw)->window))));
-+              matewnck_screen = wnck_screen_get(GDK_SCREEN_XNUMBER(gdk_drawable_get_screen(GDK_DRAWABLE(GTK_WIDGET(nw)->window))));
-       #endif
- 
--      matewnck_screen_force_update (matewnck_screen);
-+      wnck_screen_force_update (matewnck_screen);
- 
--      matewnck_workspace = matewnck_screen_get_active_workspace (matewnck_screen);
-+      matewnck_workspace = wnck_screen_get_active_workspace (matewnck_screen);
- 
--      for (l = matewnck_screen_get_windows_stacked (matewnck_screen); l != NULL; l = l->next)
-+      for (l = wnck_screen_get_windows_stacked (matewnck_screen); l != NULL; l = l->next)
-       {
--              MatewnckWindow *matewnck_win = (MatewnckWindow *) l->data;
-+              WnckWindow *matewnck_win = (WnckWindow *) l->data;
- 
--              if (matewnck_window_is_on_workspace (matewnck_win, matewnck_workspace) && matewnck_window_is_fullscreen (matewnck_win) && matewnck_window_is_active (matewnck_win))
-+              if (wnck_window_is_on_workspace (matewnck_win, matewnck_workspace) && wnck_window_is_fullscreen (matewnck_win) && wnck_window_is_active (matewnck_win))
-               {
-                       /*
-                        * Sanity check if the window is _really_ fullscreen to
-                        * work around a bug in libmatewnck that doesn't get all
-                        * unfullscreen events.
-                        */
--                      int sw = matewnck_screen_get_width (matewnck_screen);
--                      int sh = matewnck_screen_get_height (matewnck_screen);
-+                      int sw = wnck_screen_get_width (matewnck_screen);
-+                      int sh = wnck_screen_get_height (matewnck_screen);
-                       int x, y, w, h;
- 
--                      matewnck_window_get_geometry (matewnck_win, &x, &y, &w, &h);
-+                      wnck_window_get_geometry (matewnck_win, &x, &y, &w, &h);
- 
-                       if (sw == w && sh == h)
-                       {