Author: kiesiu Date: Sat Apr 9 20:49:58 2011 GMT Module: packages Tag: HEAD ---- Log message: - patching against libnotify >= 0.7.0 - rel 5
---- Files affected: packages/gossip: gossip.spec (1.92 -> 1.93) , gossip-libnotify.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gossip/gossip.spec diff -u packages/gossip/gossip.spec:1.92 packages/gossip/gossip.spec:1.93 --- packages/gossip/gossip.spec:1.92 Fri Feb 4 19:23:54 2011 +++ packages/gossip/gossip.spec Sat Apr 9 22:49:53 2011 @@ -4,11 +4,12 @@ Summary(pl.UTF-8): Bardzo prosty w użyciu klient Jabbera dla GNOME Name: gossip Version: 0.31 -Release: 4 +Release: 5 License: GPL Group: Applications/Communications Source0: http://ftp.gnome.org/pub/GNOME/sources/gossip/%{version}/%{name}-%{version}.tar.bz2 # Source0-md5: feacf7a78ced249268898d2a3f7063cd +Patch0: %{name}-libnotify.patch URL: http://live.gnome.org/Gossip/ BuildRequires: aspell-devel BuildRequires: autoconf @@ -24,10 +25,11 @@ BuildRequires: libgalago-devel >= 0.5.1 BuildRequires: libglade2-devel >= 1:2.6.0 BuildRequires: libgnomeui-devel >= 2.16.1 -BuildRequires: libnotify-devel >= 0.4.2 +BuildRequires: libnotify-devel >= 0.7.0 BuildRequires: libtool BuildRequires: libxml2-devel >= 1:2.6.27 BuildRequires: loudmouth-devel >= 1.3.4 +BuildRequires: pkgconfig >= 1:0.16 BuildRequires: rpmbuild(macros) >= 1.311 BuildRequires: xorg-lib-libXScrnSaver-devel Requires(post,postun): gtk-update-icon-cache @@ -51,6 +53,7 @@ %prep %setup -q +%patch0 -p1 %build %{__glib_gettextize} @@ -99,8 +102,6 @@ %defattr(644,root,root,755) %doc AUTHORS CONTRIBUTORS ChangeLog NEWS README %attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_libdir}/*-applet -%{_libdir}/bonobo/servers/* %{_datadir}/%{name} %{_datadir}/sounds/gossip %{_desktopdir}/*.desktop @@ -114,6 +115,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.93 2011/04/09 20:49:53 kiesiu +- patching against libnotify >= 0.7.0 +- rel 5 + Revision 1.92 2011/02/04 18:23:54 wiget - Requires(post,postun): gtk-update-icon-cache ================================================================ Index: packages/gossip/gossip-libnotify.patch diff -u /dev/null packages/gossip/gossip-libnotify.patch:1.1 --- /dev/null Sat Apr 9 22:49:58 2011 +++ packages/gossip/gossip-libnotify.patch Sat Apr 9 22:49:53 2011 @@ -0,0 +1,124 @@ +diff -uNr gossip-0.31.bak/src/gossip-notify.c gossip-0.31/src/gossip-notify.c +--- gossip-0.31.bak/src/gossip-notify.c 2008-06-22 01:16:27.000000000 +0200 ++++ gossip-0.31/src/gossip-notify.c 2011-04-09 22:44:37.955968968 +0200 +@@ -225,7 +225,11 @@ + gossip_contact_get_name (contact), + notify_get_default_status_from_presence (presence)); + ++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) + notify = notify_notification_new (_("Contact Online"), body, NULL, NULL); ++#else ++ notify = notify_notification_new (_("Contact Online"), body, NULL); ++#endif + notify_notification_set_urgency (notify, NOTIFY_URGENCY_LOW); + notify_notification_set_icon_from_pixbuf (notify, pixbuf); + +@@ -234,9 +238,11 @@ + G_CALLBACK (notify_closed_cb), + NULL); + ++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) + if (attach_status_icon) { + notify_notification_attach_to_status_icon (notify, attach_status_icon); + } ++#endif + + notify_notification_add_action (notify, "default", _("Default"), + (NotifyActionCallback) notify_online_action_cb, +@@ -328,15 +334,23 @@ + GTK_ICON_SIZE_MENU); + } + ++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) + notify = notify_notification_new (_("Subscription Request"), + message, + NULL, + NULL); ++#else ++ notify = notify_notification_new (_("Subscription Request"), ++ message, ++ NULL); ++#endif + g_free (message); + ++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) + if (attach_status_icon) { + notify_notification_attach_to_status_icon (notify, attach_status_icon); + } ++#endif + + notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL); + notify_notification_set_timeout (notify, NOTIFY_SUBSCRIPTION_TIME); +@@ -375,16 +389,24 @@ + notification_body = g_markup_printf_escaped (_("%s would like to send you “%s”"), + gossip_contact_get_name (gossip_ft_get_contact (ft)), + gossip_ft_get_file_name (ft)); ++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) + notification = notify_notification_new (_("File Transfer"), + notification_body, + NULL, + NULL); ++#else ++ notification = notify_notification_new (_("File Transfer"), ++ notification_body, ++ NULL); ++#endif + + g_free (notification_body); + ++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) + if (attach_status_icon) { + notify_notification_attach_to_status_icon (notification, attach_status_icon); + } ++#endif + + notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL); + +@@ -546,7 +568,11 @@ + str = g_markup_printf_escaped (_("“%s”"), body_stripped); + } + ++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) + notify = notify_notification_new (title, str, NULL, NULL); ++#else ++ notify = notify_notification_new (title, str, NULL); ++#endif + notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL); + notify_notification_set_icon_from_pixbuf (notify, pixbuf); + notify_notification_set_timeout (notify, NOTIFY_MESSAGE_TIME); +@@ -556,9 +582,11 @@ + G_CALLBACK (notify_closed_cb), + NULL); + ++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) + if (attach_status_icon) { + notify_notification_attach_to_status_icon (notify, attach_status_icon); + } ++#endif + + notify_notification_add_action (notify, "default", _("Default"), + (NotifyActionCallback) notify_new_message_default_cb, +@@ -901,7 +929,11 @@ + return FALSE; + } + ++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) + notify = notify_notification_new (summary, message, NULL, NULL); ++#else ++ notify = notify_notification_new (summary, message, NULL); ++#endif + g_object_set_data_full (G_OBJECT (notify), "conf_path", g_strdup (conf_path), g_free); + g_object_set_data (G_OBJECT (notify), "func", func); + g_signal_connect (notify, +@@ -909,9 +941,11 @@ + G_CALLBACK (notify_hint_closed_cb), + user_data); + ++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) + if (attach_status_icon) { + notify_notification_attach_to_status_icon (notify, attach_status_icon); + } ++#endif + + if (!notify_notification_show (notify, &error)) { + g_warning ("Failed to send notification: %s", ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gossip/gossip.spec?r1=1.92&r2=1.93&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
