Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at Mon Jul 25 09:01:58 CEST 2011. -------- --- KDE/amarok/amarok.changes 2011-05-10 13:05:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/amarok/amarok.changes 2011-07-21 13:14:59.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 21 11:13:22 UTC 2011 - idoenmez@suse.de + +- Enable libmygpo-qt. Remove deprecated conditions + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 37eda947-fix-plugin-loading-version-bump.diff New: ---- remove-plasma-service.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.kj52Nc/_old 2011-07-25 09:01:24.000000000 +0200 +++ /var/tmp/diff_new_pack.kj52Nc/_new 2011-07-25 09:01:24.000000000 +0200 @@ -20,7 +20,7 @@ Name: amarok Version: 2.4.1 -Release: 1 +Release: 2 Summary: Media Player for KDE License: GPLv2+ @@ -35,6 +35,9 @@ Patch2: initial-preference.diff # PATCH-FIX-OPENSUSE flac_mimetype_bnc671581.diff bnc#671581 ctrippe@gmx.net -- Support for the changed mimetype for flac files Patch3: flac_mimetype_bnc671581.diff +# PATCH-FIX-UPSTREAM remove-plasma-service.patch -- Upstream git commit edd2377b84f97da52cb8e5fa714a9ff9f8ae2a0b to fix build with KDE 4.7 rc2 +Patch4: remove-plasma-service.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build # Required for the fdupes macro @@ -49,17 +52,14 @@ BuildRequires: libgcrypt-devel BuildRequires: libgpod-devel >= 0.7.0 BuildRequires: libkde4-devel -%if 0%{?suse_version} > 1120 || !0%{?kde_updatedapps} +%if !0%{?kde_updatedapps} BuildRequires: libksuseinstall-devel BuildRequires: liblastfm-devel %endif BuildRequires: libmtp-devel -# Available only in KDE:Unstable:Playground -#BuildRequires: libmygpo-qt-devel +BuildRequires: libmygpo-qt-devel BuildRequires: libmysqlclient-devel -%if 0%{?suse_version} > 1110 BuildRequires: libmysqld-devel -%endif BuildRequires: libopenssl-devel BuildRequires: libqca2-devel BuildRequires: libqjson-devel @@ -90,13 +90,14 @@ %prep %setup -q %patch0 -%if 0%{?suse_version} > 1120 || !0%{?kde_updatedapps} +%if !0%{?kde_updatedapps} %patch1 -p1 %endif %patch2 %if 0%{?suse_version} > 1130 %patch3 %endif +%patch4 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') ++++++ remove-plasma-service.patch ++++++ --- src/context/scriptengine/javascript/bind_dataengine.h 2011-05-05 21:06:53.000000000 +0200 +++ src/context/scriptengine/javascript/bind_dataengine.h 2011-07-22 11:07:34.423875939 +0200 @@ -29,8 +29,6 @@ #if !KDE_IS_VERSION(4, 4, 76) Q_DECLARE_METATYPE(DataEngine*) #endif -Q_DECLARE_METATYPE(Service*) -Q_DECLARE_METATYPE(ServiceJob*) Q_DECLARE_METATYPE(QVariant) Q_DECLARE_METATYPE(DataEngine::Dict) Q_DECLARE_METATYPE(DataEngine::Data) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de