Mailinglist Archive: opensuse-commit (938 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package rhythmbox for openSUSE:Factory
checked in at Fri Sep 3 14:51:04 CEST 2010.



--------
--- GNOME/rhythmbox/rhythmbox.changes   2010-08-11 16:03:58.000000000 +0200
+++ rhythmbox/rhythmbox.changes 2010-08-30 16:04:03.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Aug 30 14:02:19 UTC 2010 - dimstar@xxxxxxxxxxxx
+
+- Add rhythmbox-vala-detection.patch, properly detect vala. Newer
+  versions do no longer provide a .pc file (bgo#628330).
+- Add gnome-common BuildRequires and call to autogen.sh.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  rhythmbox-vala-detection.patch

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

Other differences:
------------------
++++++ rhythmbox.spec ++++++
--- /var/tmp/diff_new_pack.jTLVqK/_old  2010-09-03 14:48:34.000000000 +0200
+++ /var/tmp/diff_new_pack.jTLVqK/_new  2010-09-03 14:48:34.000000000 +0200
@@ -19,7 +19,8 @@
 
 Name:           rhythmbox
 Version:        0.13.0
-Release:        1
+Release:        2
+# FIXME: Check, if gnome-common and autogen.sh call are still needed (patch1 - 
rhythmbox-vala-detection.patch)
 License:        GPLv2+
 Summary:        GNOME Music Management Application
 Url:            http://www.gnome.org/projects/rhythmbox/
@@ -27,6 +28,8 @@
 Source:         %{name}-%{version}.tar.bz2
 # PATCH-FIX-UPSTREAM rhythmbox-fix-upnp-plugin.patch bgo599294 
vuntz@xxxxxxxxxxxx -- Fix "import louie" failure
 Patch0:         rhythmbox-fix-upnp-plugin.patch
+# PATCH-FIX-UPSTREAM rhythmbox-vala-detection.patch bgo#628330 
dimstar@xxxxxxxxxxxx -- Properly detect vala
+Patch1:         rhythmbox-vala-detection.patch
 %if 0%{suse_version} > 1120
 %define xulrunner_version 192
 %else
@@ -40,6 +43,7 @@
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
+BuildRequires:  gnome-common
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gnome-media-devel
 BuildRequires:  gstreamer010-plugins-base-devel
@@ -97,8 +101,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
+NOCONFIGURE=1 ./autogen.sh
 export MOZILLA_PLUGINDIR=%{_libdir}/browser-plugins
 %configure\
        --libexecdir=%{_libexecdir}/rhythmbox\

++++++ rhythmbox-vala-detection.patch ++++++
Index: rhythmbox-0.13.0/configure.ac
===================================================================
--- rhythmbox-0.13.0.orig/configure.ac
+++ rhythmbox-0.13.0/configure.ac
@@ -737,16 +737,15 @@ AC_ARG_ENABLE([vala],
        [enable_vala=$enableval have_vala=$enableval],
        [enable_vala=autodetect have_vala=yes])
 AC_MSG_RESULT([$enable_vala])
-if test "x$enable_vala" = "xyes"; then
-       PKG_CHECK_MODULES(VALA, vala-1.0 >= $VALA_REQS, with_vala=yes,
-                         with_vala=no)
-       if test "x$with_vala" = "xyes"; then
-               VALAC="`pkg-config --variable=prefix vala-1.0`/bin/valac"
-               VAPIDIR="`pkg-config --variable=vapidir vala-1.0`"
-               AC_SUBST([VALAC])
-               AC_SUBST([VAPIDIR])
-       elif test "x$enable_vala" = "xyes"; then
-               AC_MSG_ERROR([Vala plugin support explicitly requested, but not 
found])
+if test "x$enable_vala" != "xno"; then
+        AM_PROG_VALAC([$VALA_REQS])
+       if test "x$VALAC" = "x"; then
+               if test "x$enable_vala" = "xyes"; then
+                       AC_MSG_ERROR([Vala plugin support explicitly requested, 
but not found])
+               fi
+               with_vala=no
+       else
+               with_vala=yes
        fi
 fi
 AM_CONDITIONAL(ENABLE_VALA, test "x$with_vala" = "xyes")

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



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx