Hello community,
here is the log from the commit of package gcompris for openSUSE:Factory
checked in at 2016-10-10 16:22:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gcompris (Old)
and /work/SRC/openSUSE:Factory/.gcompris.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcompris"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gcompris/gcompris.changes 2016-07-30
00:26:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gcompris.new/gcompris.changes 2016-10-10
16:22:08.000000000 +0200
@@ -1,0 +2,14 @@
+Fri Sep 30 15:21:49 UTC 2016 - badshah...@gmail.com
+
+- Add gcompris-gstreamer-1.0.patch: Port to gstreamer 1.0; patch
+ taken from debian patch tracker (bgo#747949, deb#785840); patch
+ touches autotool files, run autoreconf before ./configure
+ (BuildRequires added on automake, autoconf, libtool,
+ gnome-common). Update gstreamer BuildRequires accordingly.
+- Remove libtool archives from installed files for openSUSE --
+ these are not needed and causes problems such as:
+ Missing "Requires: gtk2-devel" in dependency chain
+ (/usr/lib64/gcompris/libgoocanvas.la from gcompris-devel
+ requires /usr/lib64/libgtk-x11-2.0.so) and so on.
+
+-------------------------------------------------------------------
New:
----
gcompris-gstreamer-1.0.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gcompris.spec ++++++
--- /var/tmp/diff_new_pack.tKWkF8/_old 2016-10-10 16:22:16.000000000 +0200
+++ /var/tmp/diff_new_pack.tKWkF8/_new 2016-10-10 16:22:16.000000000 +0200
@@ -30,9 +30,14 @@
Source4: gcompris.6
Patch1: gcompris-13.11-remove_build_date.patch
# work around solver bug, require the package instead the lib
+# PATCH-FIX-UPSTREAM gcompris-gstreamer-1.0.patch bgo#747949 deb#785840
badshah...@gmail.com -- Port to gstreamer 1.0; patch taken from debian patch
tracker
+Patch2: gcompris-gstreamer-1.0.patch
+BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: gettext-devel
BuildRequires: gnuchess >= 5.02
BuildRequires: intltool
+BuildRequires: libtool
BuildRequires: makeinfo
BuildRequires: pkgconfig
BuildRequires: python-devel
@@ -78,7 +83,7 @@
BuildRequires: codeina
BuildRequires: desktop-file-utils
BuildRequires: gnome-python-devel
-BuildRequires: gstreamer0.10-devel
+BuildRequires: gstreamer-devel
BuildRequires: librsvg-devel
BuildRequires: polkit-gnome
BuildRequires: pygtk2.0-devel
@@ -91,7 +96,7 @@
###########################################
%if 0%{?suse_version}
BuildRequires: fdupes
-BuildRequires: gstreamer010-devel
+BuildRequires: gnome-common
BuildRequires: intltool
BuildRequires: libgnome-devel
BuildRequires: libgnomeui-devel
@@ -102,6 +107,8 @@
BuildRequires: texlive-latex
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-libs
+BuildRequires: pkgconfig(gmodule-no-export-2.0)
+BuildRequires: pkgconfig(gstreamer-1.0)
%if 0%{?suse_version} > 1130
# to get rid of the "GLib-GIO-WARNING **: FAMOpen failed, FAMErrno=0" messages,
# we need a running FAM server (not mandatory):
@@ -428,6 +435,7 @@
%prep
%setup -q
%patch1 -p1
+%patch2 -p1
find . -name ".cvsignore" -delete
find . -name ".gitignore" -delete
# wrong-file-end-of-line-encoding
@@ -438,6 +446,7 @@
if [ -f /usr/share/gettext/config.rpath -a ! -f config.rpath ] ; then
cp -v /usr/share/gettext/config.rpath .
fi
+autoreconf -fiv
%configure --quiet \
--enable-sqlite \
--disable-static \
@@ -476,6 +485,11 @@
#
# save space, use fdupes
#
+
+# REMOVE LIBTOOL ARCHIVE, THESE ARE UNNECESSARY, AND INTRODUCE WARNINGS LIKE:
+# Missing "Requires: gtk2-devel" in dependency chain
(/usr/lib64/gcompris/libgoocanvas.la from gcompris-devel requires
/usr/lib64/libgtk-x11-2.0.so)
+rm -fr %{buildroot}%{_libdir}/gcompris/*.la
+
%fdupes %{buildroot}
%endif
test -f %{buildroot}%{_datadir}/gcompris/boards/voices/recode.sh && chmod +x
%{buildroot}%{_datadir}/gcompris/boards/voices/recode.sh
@@ -532,7 +546,6 @@
%files devel
%defattr(-, root, root)
-%{_libdir}/gcompris/*.*a
%{_libdir}/gcompris/libgoocanvas.so
%files voices-ar
++++++ gcompris-gstreamer-1.0.patch ++++++
--- gcompris-15.02.orig/configure.ac
+++ gcompris-15.02/configure.ac
@@ -389,7 +389,7 @@ if test x$with_sdlmixer = xyes; then
AUDIO_LIBS="$AUDIO_LIBS -lSDL_mixer"
else
dnl Default is gstreamer
- PKG_CHECK_MODULES(AUDIO, gstreamer-0.10,, AC_MSG_ERROR([*** GSTREAMER not
found!]))
+ PKG_CHECK_MODULES(AUDIO, gstreamer-1.0 gmodule-no-export-2.0,,
AC_MSG_ERROR([*** GSTREAMER not found!]))
AC_DEFINE([USE_GSTREAMER], 1,[gstreamer is enabled])
fi
AC_SUBST(AUDIO_CFLAGS)
Index: gcompris-15.10/src/gcompris/gstreamer.c
===================================================================
--- gcompris-15.10.orig/src/gcompris/gstreamer.c
+++ gcompris-15.10/src/gcompris/gstreamer.c
@@ -24,6 +24,7 @@
#include "gcompris.h"
#include <signal.h>
+#include <stdlib.h>
#include <glib.h>
#include <gst/gst.h>
