Hello community,

here is the log from the commit of package gwget for openSUSE:Factory
checked in at Wed Jun 1 09:57:02 CEST 2011.



--------
--- GNOME/gwget/gwget.changes   2011-02-12 20:25:59.000000000 +0100
+++ /mounts/work_src_done/STABLE/gwget/gwget.changes    2011-05-31 
16:00:11.000000000 +0200
@@ -1,0 +2,10 @@
+Tue May 31 15:00:24 CEST 2011 - [email protected]
+
+- Disable the build of the epiphany extension with a
+  %build_epiphany define, unless %favor_gtk2 is set (which means we
+  don't build against GNOME 3).
+- Add libnotify-devel BuildRequires to build with notification
+  support.
+- Add gwget-libnotify-0.7.patch to fix build with libnotify 0.7.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  gwget-libnotify-0.7.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gwget.spec ++++++
--- /var/tmp/diff_new_pack.wWdJiV/_old  2011-06-01 09:53:36.000000000 +0200
+++ /var/tmp/diff_new_pack.wWdJiV/_new  2011-06-01 09:53:36.000000000 +0200
@@ -15,24 +15,31 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
+%define build_epiphany %{?favor_gtk2}
 
 Name:           gwget
-BuildRequires:  epiphany-devel fdupes intltool
+%if 0%{?build_epiphany}
+BuildRequires:  epiphany-devel
+%endif
+BuildRequires:  fdupes intltool
 BuildRequires:  libgnomeui-devel
+BuildRequires:  libnotify-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 License:        GPLv2+
 Group:          Productivity/Networking/Web/Utilities
 Requires:       wget
 Version:        1.0.4
-Release:        8
+Release:        13
+# FIXME: on version upgrade, check if build_epiphany is still needed (last 
checked: 1.0.4)
 Summary:        GTK+ Front-End to wget
 Url:            http://gnome.org/projects/gwget/
 Source:         %{name}-%{version}.tar.bz2
 # PATCH-FIX-UPSTREAM gwget-epiphany-2.29.patch bgo609544 [email protected] -- 
Fix build against newer epiphany
 Patch0:         gwget-epiphany-2.29.patch
+# PATCH-FIX-UPSTREAM gwget-libnotify-0.7.patch bgo#634170 [email protected] 
-- Fix build with libnotify 0.7
+Patch1:         gwget-libnotify-0.7.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Recommends:     %{name}-lang
 %gconf_schemas_prereq
@@ -44,13 +51,18 @@
 %prep
 %setup -q
 translation-update-upstream
+%if 0%{?build_epiphany}
 %patch0 -p1
+%endif
+%patch1 -p1
 
 %build
 %configure \
         --disable-static \
-        --disable-schemas-install \
-        --enable-epiphany-extension
+%if 0%{?build_epiphany}
+        --enable-epiphany-extension \
+%endif
+        --disable-schemas-install
 make %{?jobs:-j%jobs}
 
 %install
@@ -87,13 +99,15 @@
 %files -f %{name}.schemas_list
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO THANKS
-%dir %{_libdir}/epiphany/*/extensions
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/gwget
 %{_datadir}/pixmaps/%{name}*.*
 %{_datadir}/dbus-1/services/org.gnome.gwget.service
+%if 0%{?build_epiphany}
+%dir %{_libdir}/epiphany/*/extensions
 %{_libdir}/epiphany/*/*/*.*
+%endif
 
 %files lang -f %{name}.lang
 

++++++ gwget-libnotify-0.7.patch ++++++
Index: gwget-1.0.4/src/systray.c
===================================================================
--- gwget-1.0.4.orig/src/systray.c
+++ gwget-1.0.4/src/systray.c
@@ -224,7 +224,12 @@ gwget_tray_notify (gchar *primary, gchar
                        if (!notify_is_initted ())
                        if (!notify_init ("gwget"))
                               return;
-       NotifyNotification *notification = 
notify_notification_new(primary,secondary,icon_name,NULL);
+       NotifyNotification *notification = 
notify_notification_new(primary,secondary,icon_name
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+                      );
+#else
+                      , NULL);
+#endif
        notify_notification_show(notification,NULL);
 #endif
 
Index: gwget-1.0.4/src/systray.h
===================================================================
--- gwget-1.0.4.orig/src/systray.h
+++ gwget-1.0.4/src/systray.h
@@ -12,6 +12,9 @@ extern "C"
 #endif
 #ifdef HAVE_NOTIFY
 #include <libnotify/notify.h>
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
 #endif
 
 void systray_load(void);

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to