commit amarok for openSUSE:Factory
Hello community,
here is the log from the commit of package amarok for openSUSE:Factory
checked in at Fri Aug 27 16:05:37 CEST 2010.
--------
--- KDE/amarok/amarok.changes 2010-08-13 10:03:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/amarok/amarok.changes 2010-08-25 15:45:45.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 25 13:10:54 UTC 2010 - coolo@novell.com
+
+- fix build in reordering includes for qt and gdk (later uses
+ "signals")
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
fix_define_mismatch.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.WvqxsR/_old 2010-08-27 16:04:57.000000000 +0200
+++ /var/tmp/diff_new_pack.WvqxsR/_new 2010-08-27 16:04:57.000000000 +0200
@@ -42,7 +42,7 @@
Group: Productivity/Multimedia/Sound/Players
Summary: Media Player for KDE
Version: 2.3.1
-Release: 2
+Release: 3
Source0: %{name}-%{version}.tar.bz2
Source100: %{name}-rpmlintrc
Patch3: errmsg-mysql-embedded.diff
@@ -51,6 +51,7 @@
Patch5: no_buildtime.patch
Patch7: ksuseinstall.diff
Patch8: initial-preference.diff
+Patch9: fix_define_mismatch.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: kde4-amarok = 2.0.90
Obsoletes: kde4-amarok <= 2.0.89
@@ -96,6 +97,7 @@
%patch7 -p1
%endif
%patch8
+%patch9 -p1
%build
%ifarch ppc ppc64
++++++ fix_define_mismatch.diff ++++++
Index: amarok-2.3.1/src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp
===================================================================
--- amarok-2.3.1.orig/src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp 2010-05-27 20:37:21.000000000 +0200
+++ amarok-2.3.1/src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp 2010-08-25 15:09:53.806249360 +0200
@@ -19,11 +19,8 @@
#define DEBUG_PREFIX "IpodHandler"
-#include "IpodHandler.h"
-
-#include "IpodCollection.h"
-#include "core-impl/collections/support/CollectionManager.h"
-#include "core/support/Debug.h"
+/* CMake check for GDK */
+#include
participants (1)
-
root@hilbert.suse.de