Hello community, here is the log from the commit of package notify-sharp for openSUSE:Factory checked in at 2012-01-20 20:24:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/notify-sharp (Old) and /work/SRC/openSUSE:Factory/.notify-sharp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "notify-sharp", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/notify-sharp/notify-sharp.changes 2011-09-23 02:14:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.notify-sharp.new/notify-sharp.changes 2012-01-20 20:25:23.000000000 +0100 @@ -1,0 +2,27 @@ +Wed Jan 18 10:09:18 UTC 2012 - [email protected] + +- Update the tarball to revision 3032, which seems to be what all + other distributions are using; this is needed by some apps like + smuxi. Note that it's still version 0.4.0 somehow, since there + was no official release. +- Add notify-sharp-fix-app-name-derivation.patch: fixes an issue + with notification naming with banshee. Taken from Debian. +- Replace notify-sharp-use-dbus-sharp.patch with patch from + https://github.com/hyperair/notify-sharp. +- Add autoconf and automake BuildRequires, needed for the + autoreconf call. + +------------------------------------------------------------------- +Thu Jul 7 05:26:12 UTC 2011 - [email protected] + +- Add notify-sharp-use-dbus-sharp.patch - uses dbus-sharp instead + of deprecated ndesk-dbus. +- Spec changes: + + Add devel sub-package. + + Add pkgconfig() calls for >= 1130. + + Package is noarch, installs on %{_libexecdir} and .pc file + goes to %{_datadir} (compliant with other mono packages). + + Removed %clean section (not required) anymore. + + Minor cleanups. + +------------------------------------------------------------------- Old: ---- notify-sharp-0.4.0.tar.gz New: ---- notify-sharp-0.4.0.r3032.tar.gz notify-sharp-fix-app-name-derivation.patch notify-sharp-use-dbus-sharp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notify-sharp.spec ++++++ --- /var/tmp/diff_new_pack.9soZFz/_old 2012-01-20 20:25:32.000000000 +0100 +++ /var/tmp/diff_new_pack.9soZFz/_new 2012-01-20 20:25:32.000000000 +0100 @@ -15,19 +15,44 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - +# This package installs in /usr/lib and .pc file goes to /usr/share/pkgconfig +# Define _libexecdir for <= 1110 +%if 0%{?suse_version} <= 1110 +%define _libexecdir %{_prefix}/lib +%endif Name: notify-sharp Url: http://trac.galago-project.org/wiki/DesktopNotifications -Version: 0.4.0 -Release: 209 -License: X11/MIT -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gtk-sharp2 gtk2-devel mono-devel monodoc ndesk-dbus ndesk-dbus-glib ndesk-dbus-glib-devel -Source: %{name}-%{version}.tar.gz +Version: 0.4.0.r3032 +%define _version 0.4.0 +Release: 0 +License: MIT Group: Development/Libraries/Other -Summary: notify-sharp is a C# client implementation for Desktop Notifications +Summary: A C# client implementation for Desktop Notifications +Source: %{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM notify-sharp-use-dbus-sharp [email protected] -- replaces the usage of deprecated NDesk.DBus by dbus-sharp, see https://github.com/hyperair/notify-sharp +Patch0: %{name}-use-dbus-sharp.patch +# PATCH-FIX-UPSTREAM notify-sharp-fix-app-name-derivation.patch [email protected] -- Fix finding the app name, taken from Debian +Patch1: notify-sharp-fix-app-name-derivation.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +BuildRequires: autoconf +BuildRequires: automake +%if 0%{?suse_version} >= 1130 +BuildRequires: pkgconfig(dbus-sharp-1.0) +BuildRequires: pkgconfig(dbus-sharp-glib-1.0) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk-sharp-2.0) +BuildRequires: pkgconfig(mono) +BuildRequires: pkgconfig(monodoc) +%else +BuildRequires: dbus-sharp-devel +BuildRequires: dbus-sharp-glib-devel +BuildRequires: gtk2-devel +BuildRequires: gtk-sharp2 +BuildRequires: mono-devel +BuildRequires: monodoc +%endif Recommends: notification-daemon %description @@ -40,36 +65,50 @@ that they must close. Passive popups can automatically disappear after a short period of time. +%package devel +Summary: A C# client implementation for Desktop Notifications +Group: Development/Libraries/Other +Requires: %{name} = %{version} +%description devel +notify-sharp is a C# client implementation for Desktop Notifications, +i.e. notification-daemon. It is inspired by the libnotify API. -Authors: --------- - Sebastian Dr�ge <[email protected]> +Desktop Notifications provide a standard way of doing passive pop-up +notifications on the Linux desktop. These are designed to notify the +user of something without interrupting their work with a dialog box +that they must close. Passive popups can automatically disappear after +a short period of time. %prep -%setup +%setup -q -n %{name}-%{_version} +%patch0 -p1 +%patch1 -p1 %build -%configure --libdir=%{_prefix}/lib --disable-docs +NOCONFIGURE=1 autoreconf -fi +%configure \ + --libdir=%{_libexecdir} \ + --disable-docs make %{?jobs:-j%jobs} %install -make DESTDIR="$RPM_BUILD_ROOT" install -%if "%_lib" == "lib64" -mkdir -p $RPM_BUILD_ROOT/usr/%_lib/pkgconfig -mv -v $RPM_BUILD_ROOT/usr/lib/pkgconfig/* $RPM_BUILD_ROOT/usr/%_lib/pkgconfig -%endif - -%clean -rm -rf "$RPM_BUILD_ROOT" +# For backward compatability with <= 1110 +%makeinstall +# Move .pc file to /usr/share/pkgconfig (for no arch) and remove from libdir +install -Dm 0644 %{name}.pc %{buildroot}%{_datadir}/pkgconfig/%{name}.pc +find %{buildroot}%{_libexecdir} -name %{name}.pc -type f -print -delete %files %defattr(-,root,root) -%dir %{_prefix}/lib/mono/gac/notify-sharp -%{_prefix}/lib/mono/gac/notify-sharp/* -%dir %{_prefix}/lib/mono/notify-sharp -%{_prefix}/lib/mono/notify-sharp/* +%dir %{_libexecdir}/mono/gac/%{name} +%{_libexecdir}/mono/gac/%{name}/ +%dir %{_libexecdir}/mono/%{name} +%{_libexecdir}/mono/%{name}/ #/usr/lib/monodoc/sources/* -%{_libdir}/pkgconfig/notify-sharp.pc + +%files devel +%defattr(-,root,root) +%{_datadir}/pkgconfig/%{name}.pc %changelog ++++++ notify-sharp-fix-app-name-derivation.patch ++++++ Subject: Use GetEntryAssembly() to derive app_name Bug-Ubuntu: https://bugs.launchpad.net/bugs/825769 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=656533 From: Chow Loong Jin <[email protected]> Forwarded: no diff --git a/src/Notification.cs b/src/Notification.cs index d40683c..778c917 100644 --- a/src/Notification.cs +++ b/src/Notification.cs @@ -112,7 +112,12 @@ namespace Notifications { nf.NotificationClosed += OnClosed; nf.ActionInvoked += OnActionInvoked; - this.app_name = Assembly.GetCallingAssembly().GetName().Name; + Assembly app_asm = Assembly.GetEntryAssembly(); + + if (app_asm == null) + app_asm = Assembly.GetCallingAssembly(); + + this.app_name = app_asm.GetName().Name; } public Notification (string summary, string body) : this () { -- ++++++ notify-sharp-use-dbus-sharp.patch ++++++ >From 6f2d4c1188d6068735c95836fdd4cdad43b96642 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz <[email protected]> Date: Mon, 14 Nov 2011 07:32:50 +0800 Subject: [PATCH] Port to DBus# bindings --- configure.ac | 10 +++++----- src/Global.cs | 2 +- src/Makefile.am | 2 +- src/Notification.cs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index bd4dce5..e259168 100644 --- a/configure.ac +++ b/configure.ac @@ -66,11 +66,11 @@ GTK_SHARP_REQ_VERSION=2.10.1 PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION) AC_SUBST(GTK_SHARP_LIBS) -NDESK_DBUS_REQ_VERSION=0.4 -NDESK_DBUS_GLIB_REQ_VERSION=0.3 -PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQ_VERSION \ - ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQ_VERSION) -AC_SUBST(NDESK_DBUS_LIBS) +DBUS_SHARP_REQ_VERSION=0.7 +DBUS_SHARP_GLIB_REQ_VERSION=0.5 +PKG_CHECK_MODULES(DBUS_SHARP, dbus-sharp-1.0 >= $DBUS_SHARP_REQ_VERSION \ + dbus-sharp-glib-1.0 >= $DBUS_SHARP_GLIB_REQ_VERSION) +AC_SUBST(DBUS_SHARP_LIBS) required_assemblies="Mono.Posix" diff --git a/src/Global.cs b/src/Global.cs index eedefbf..a0f80ed 100644 --- a/src/Global.cs +++ b/src/Global.cs @@ -24,7 +24,7 @@ using System.Reflection; using System.Collections.Generic; -using NDesk.DBus; +using DBus; using org.freedesktop; using org.freedesktop.DBus; diff --git a/src/Makefile.am b/src/Makefile.am index 3b39c23..50bbb39 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,7 @@ CSFLAGS = \ LIBFLAGS = \ -r:Mono.Posix \ $(GTK_SHARP_LIBS) \ - $(NDESK_DBUS_LIBS) + $(DBUS_SHARP_LIBS) CSFILES = \ $(srcdir)/Global.cs \ diff --git a/src/Notification.cs b/src/Notification.cs index f532bf8..8e9392f 100644 --- a/src/Notification.cs +++ b/src/Notification.cs @@ -28,7 +28,7 @@ using Gdk; using Gtk; -using NDesk.DBus; +using DBus; using org.freedesktop; using org.freedesktop.DBus; -- 1.7.5.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
