Hello community, here is the log from the commit of package girl for openSUSE:Factory checked in at 2016-01-15 10:40:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/girl (Old) and /work/SRC/openSUSE:Factory/.girl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "girl" Changes: -------- --- /work/SRC/openSUSE:Factory/girl/girl.changes 2015-05-18 21:21:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.girl.new/girl.changes 2016-01-15 10:40:48.000000000 +0100 @@ -1,0 +2,16 @@ +Sat Jan 9 01:18:50 UTC 2016 - [email protected] + +- Update to version 7.0.0: + + Add new icons. + + Added stations: Narvik Studentradio, Radio Campus & City +- Changes from version 6.1.0: + + Add new <name> and <summary> tags to appdata.xml. + + Update FSF address (bgo#753044). +- Changes from version 6.0.0: + + Added stations: Add RÚV, Add Radio AF. + + Updated translations. +- Drop pkgconfig(libgnomecanvas-2.0) BuildRequires: no longer + needed since version 5.0.0. +- Rebase girl-no-return-in-nonvoid.patch. + +------------------------------------------------------------------- Old: ---- girl-5.0.0.tar.xz New: ---- girl-7.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ girl.spec ++++++ --- /var/tmp/diff_new_pack.nMCvpJ/_old 2016-01-15 10:40:49.000000000 +0100 +++ /var/tmp/diff_new_pack.nMCvpJ/_new 2016-01-15 10:40:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package girl # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: girl -Version: 5.0.0 +Version: 7.0.0 Release: 0 Summary: Find live radio programs on radio broadcasters on the Internet License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Utilities Url: http://www.ping.uio.no/~oka/src/girl/ -Source: https://download.gnome.org/sources/girl/5.0/%{name}-%{version}.tar.xz +Source: https://download.gnome.org/sources/girl/7.0/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM girl-no-return-in-nonvoid.patch [email protected] -- Change definition of girl_archive_new from gint to void (there is currently no code in this function). Not submitted upstream: the function is obviously only a place-holder. Patch0: girl-no-return-in-nonvoid.patch BuildRequires: desktop-file-utils @@ -31,12 +31,11 @@ BuildRequires: hicolor-icon-theme BuildRequires: intltool BuildRequires: itstool -BuildRequires: pkgconfig(gnome-vfs-2.0) -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(libgnome-2.0) -BuildRequires: pkgconfig(libgnomecanvas-2.0) -BuildRequires: pkgconfig(libgnomeui-2.0) -BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(gnome-vfs-2.0) >= 2.0 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.0 +BuildRequires: pkgconfig(libgnome-2.0) >= 2.0 +BuildRequires: pkgconfig(libgnomeui-2.0) >= 2.0 +BuildRequires: pkgconfig(libxml-2.0) >= 2.0 Requires: totem Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -82,10 +81,7 @@ %dir %{_datadir}/appdata %{_datadir}/appdata/*.xml %{_mandir}/man1/girl.1%{?ext_man} -%dir %{_datadir}/help/C/girl -%{_datadir}/help/C/girl/*.page -%dir %{_datadir}/help/C/girl/media -%{_datadir}/help/C/girl/media/*.png +%{_datadir}/help/C/girl/ %files lang -f %{name}.lang %defattr(-,root,root) ++++++ girl-5.0.0.tar.xz -> girl-7.0.0.tar.xz ++++++ ++++ 10792 lines of diff (skipped) ++++++ girl-no-return-in-nonvoid.patch ++++++ --- /var/tmp/diff_new_pack.nMCvpJ/_old 2016-01-15 10:40:49.000000000 +0100 +++ /var/tmp/diff_new_pack.nMCvpJ/_new 2016-01-15 10:40:49.000000000 +0100 @@ -1,13 +1,34 @@ -diff --git a/src/girl.c b/src/girl.c -index 6387708..2dee5b3 100644 ---- a/src/girl.c -+++ b/src/girl.c -@@ -818,7 +818,7 @@ girl_archive_progress_callback(GnomeVFSXferProgressInfo * info, gpointer data) +Index: girl-7.0.0/src/girl.c +=================================================================== +--- girl-7.0.0.orig/src/girl.c ++++ girl-7.0.0/src/girl.c +@@ -596,7 +596,7 @@ void about_listener(GtkWidget * a, gpoin + + void about_program(GtkWidget * a, gpointer user_data) + { +- GtkWidget *about_program; ++ GtkWidget *about_program = NULL; + + /* const gchar *translator_credits = _("translator_credits"); */ + const gchar *authors[] = { +@@ -830,6 +830,6 @@ girl_archive_progress_callback(GnomeVFSX return TRUE; } --gint girl_archive_new(GPid *pid, gchar *file) -+void girl_archive_new(GPid *pid, gchar *file) +-gint girl_archive_new(gchar *title, gchar *file) ++void girl_archive_new(gchar *title, gchar *file) { - #if 0 - const gchar *temp; + } +Index: girl-7.0.0/src/girl.h +=================================================================== +--- girl-7.0.0.orig/src/girl.h ++++ girl-7.0.0/src/girl.h +@@ -71,7 +71,7 @@ void statusbar_send_msg(const char *a, . + gchar *copy_to_mem(GnomeVFSURI * uri, GnomeVFSFileSize len); + + void appbar_send_msg(const char *a, ...); +-gint girl_archive_new(gchar *title, gchar *file); ++void girl_archive_new(gchar *title, gchar *file); + + /* Fetcher for the channels */ +
