commit notify-osd for openSUSE:Factory
Hello community, here is the log from the commit of package notify-osd for openSUSE:Factory checked in at Mon Sep 19 22:56:10 CEST 2011. -------- --- GNOME/notify-osd/notify-osd.changes 2011-05-20 00:47:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/notify-osd/notify-osd.changes 2011-09-19 15:49:58.000000000 +0200 @@ -1,0 +2,19 @@ +Mon Sep 19 13:27:49 UTC 2011 - vuntz@opensuse.org + +- Update to version 0.9.32: + + Migrate to GSettings. +- Changes from version 0.9.31: + + Port to GNOME 3 technologies. +- Change pkgconfig() BuildRequires to move to GNOME 3 technologies: + + Old ones: gtk+-2.0, libwnck-1.0. + + New ones: gtk+-3.0, libwnck-3.0. +- Drop pkgconfig(gconf-2.0) BuildRequires: moved to GSettings. +- Drop notify-osd-libnotify-0.7.patch: fixed upstream. +- Rebase notify-osd-leolik.patch. +- Add notify-osd-link-libm.patch: fix build with new stricter + linker from Factory. +- Add gnome-common BuildRequires and call to gnome-autogen.sh, + needed for above patch. +- Use %glib2_gsettings_schema_* macros for new GSettings schemas. + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback GNOME/notify-osd Destination is notify-osd calling whatdependson for head-i586 Old: ---- notify-osd-0.9.30.tar.bz2 notify-osd-libnotify-0.7.patch New: ---- notify-osd-0.9.32.tar.gz notify-osd-link-libm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notify-osd.spec ++++++ --- /var/tmp/diff_new_pack.L5qcaG/_old 2011-09-19 22:56:04.000000000 +0200 +++ /var/tmp/diff_new_pack.L5qcaG/_new 2011-09-19 22:56:04.000000000 +0200 @@ -18,27 +18,29 @@ Name: notify-osd -Version: 0.9.30 +Version: 0.9.32 Release: 1 License: GPLv3+ Summary: Streamlined Notification Daemon Url: https://launchpad.net/notify-osd Group: System/X11/Utilities -Source: http://edge.launchpad.net/notify-osd/lucid/ubuntu-10.04-beta-2/+download/%{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.gz # PATCH-FEATURE-UPSTREAM notify-osd-leolik.patch -- Extend the configuration capabilities, patch by Roman Sukochev (Leolik). Taken from https://launchpad.net/~leolik/+archive/leolik. Note that upstream didn't accept this patch. Patch0: notify-osd-leolik.patch -# PATCH-FIX-UPSTREAM notify-osd-libnotify-0.7.patch lp#785452 dimstar@opensuse.org -- Fix build with libnotify 0.7 -Patch1: notify-osd-libnotify-0.7.patch +# PATCH-FIX-UPSTREAM notify-osd-link-libm.patch lp#853871 vuntz@opensuse.org -- Link to libm +Patch1: notify-osd-link-libm.patch BuildRequires: fdupes +# needed for patch1 +BuildRequires: gnome-common BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.1.6 BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(libwnck-1.0) +BuildRequires: pkgconfig(libwnck-3.0) # Both packages provide {_datadir}/dbus-1/services/org.freedesktop.Notifications.service Conflicts: notification-daemon BuildRoot: %{_tmppath}/%{name}-%{version}-build +%glib2_gsettings_schema_requires %description This notification daemon is an alternative to the notification-daemon @@ -52,6 +54,8 @@ %patch1 -p1 %build +# needed for patch1 +NOCONFIGURE=1 gnome-autogen.sh %configure %__make %{?_smp_mflags} @@ -62,11 +66,18 @@ %clean rm -rf %{buildroot} +%post +%glib2_gsettings_schema_post + +%postun +%glib2_gsettings_schema_postun + %files %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO %{_datadir}/%{name}/ %{_datadir}/dbus-1/services/org.freedesktop.Notifications.service +%{_datadir}/glib-2.0/schemas/com.canonical.NotifyOSD.gschema.xml %{_libexecdir}/%{name} %changelog ++++++ notify-osd-leolik.patch ++++++ --- /var/tmp/diff_new_pack.L5qcaG/_old 2011-09-19 22:56:04.000000000 +0200 +++ /var/tmp/diff_new_pack.L5qcaG/_new 2011-09-19 22:56:04.000000000 +0200 @@ -126,10 +126,10 @@ +float DEFAULT_FADE_OUT_TIMEOUT = 1000; +float DEFAULT_ON_SCREEN_TIMEOUT = 10000; - /* GConf-keys to watch */ - #define GCONF_UI_FONT_NAME "/desktop/gnome/interface/font_name" + /* notify-osd settings */ + #define NOTIFY_OSD_SCHEMA "com.canonical.notify-osd" @@ -280,7 +281,7 @@ _get_gravity (Defaults* self) - } + gravity = g_settings_get_int (self->nosd_settings, GSETTINGS_GRAVITY_KEY); // protect against out-of-bounds values for gravity - if (gravity != GRAVITY_EAST && gravity != GRAVITY_NORTH_EAST) @@ -138,7 +138,7 @@ // update stored DPI-value @@ -764,7 +765,7 @@ defaults_init (Defaults* self) - } + self); // use fixed slot-allocation for async. and sync. bubbles - self->slot_allocation = SLOT_ALLOCATION_FIXED; ++++++ notify-osd-link-libm.patch ++++++ Index: notify-osd-0.9.32/configure.in =================================================================== --- notify-osd-0.9.32.orig/configure.in +++ notify-osd-0.9.32/configure.in @@ -69,6 +69,13 @@ AC_SUBST(NOTIFY_OSD_CFLAGS) AC_SUBST(NOTIFY_OSD_LIBS) # +# libm +# + +AC_CHECK_LIBM +AC_SUBST(LIBM) + +# # checks for building C- or C#-examples # AC_DEFUN([CHECK_FOR_MONO_STUFF], Index: notify-osd-0.9.32/src/Makefile.am =================================================================== --- notify-osd-0.9.32.orig/src/Makefile.am +++ notify-osd-0.9.32/src/Makefile.am @@ -81,6 +81,7 @@ notify_osd_SOURCES = \ $(NULL) notify_osd_LDADD = \ + $(LIBM) \ $(X_LIBS) \ $(GLIB_LIBS) \ $(GTK_LIBS) \ Index: notify-osd-0.9.32/tests/Makefile.am =================================================================== --- notify-osd-0.9.32.orig/tests/Makefile.am +++ notify-osd-0.9.32/tests/Makefile.am @@ -66,6 +66,7 @@ test_modules_CFLAGS = \ -I$(top_srcdir)/ test_modules_LDADD = \ + $(LIBM) \ $(X_LIBS) \ $(GLIB_LIBS) \ $(WNCK_LIBS) \ @@ -128,6 +129,7 @@ test_raico_CFLAGS = \ -I$(top_srcdir)/ test_raico_LDADD = \ + $(LIBM) \ $(NOTIFY_OSD_LIBS) \ $(GTK_LIBS) @@ -147,6 +149,7 @@ test_tile_CFLAGS = \ -I$(top_srcdir) test_tile_LDADD = \ + $(LIBM) \ $(X_LIBS) \ $(NOTIFY_OSD_LIBS) \ $(GTK_LIBS) @@ -166,6 +169,7 @@ test_grow_bubble_CFLAGS = \ -I$(top_srcdir) test_grow_bubble_LDADD = \ + $(LIBM) \ $(X_LIBS) \ $(NOTIFY_OSD_LIBS) \ $(GTK_LIBS) @@ -185,6 +189,7 @@ test_scroll_text_CFLAGS = \ -I$(top_srcdir)/ test_scroll_text_LDADD = \ + $(LIBM) \ $(X_LIBS) \ $(NOTIFY_OSD_LIBS) \ $(GTK_LIBS) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de