Hello community,
here is the log from the commit of package amarok for openSUSE:Factory checked
in at 2015-12-20 10:51:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/amarok (Old)
and /work/SRC/openSUSE:Factory/.amarok.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok"
Changes:
--------
--- /work/SRC/openSUSE:Factory/amarok/amarok.changes 2015-11-24
22:28:29.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.amarok.new/amarok.changes 2015-12-20
10:51:21.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Dec 18 16:12:05 UTC 2015 - tchva...@suse.com
+
+- Cleanup with spec-cleaner
+- Do not conditionalize ffmpeg, we don't need to be in packman
+ the factory ffmpeg is enough
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.VQL8R0/_old 2015-12-20 10:51:24.000000000 +0100
+++ /var/tmp/diff_new_pack.VQL8R0/_new 2015-12-20 10:51:24.000000000 +0100
@@ -16,8 +16,8 @@
#
-%bcond_with ffmpeg
-
+# Make sure to require at least the version used for linking to avoid
undefined symbols at runtime
+%define required_libtag %(rpm -qf `ldd $(type -P tagreader) | awk
'/libtag.so.[0-9]/{ print $3 }'`)
Name: amarok
Version: 2.8.0
Release: 0
@@ -59,14 +59,6 @@
BuildRequires: fdupes
BuildRequires: gdk-pixbuf-devel
BuildRequires: libcurl-devel
-BuildRequires: pkgconfig(glib-2.0)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if %{with ffmpeg}
-BuildRequires: libofa-devel
-BuildRequires: pkgconfig(libavcodec)
-BuildRequires: pkgconfig(libavformat)
-BuildRequires: pkgconfig(libavutil)
-%endif
BuildRequires: libgcrypt-devel
BuildRequires: libgpod-devel >= 0.7.0
BuildRequires: libkde4-devel >= 4.6.0
@@ -75,6 +67,7 @@
BuildRequires: libmygpo-qt-devel >= 1.0.5
BuildRequires: libmysqlclient-devel
BuildRequires: libmysqld-devel
+BuildRequires: libofa-devel
BuildRequires: libopenssl-devel
BuildRequires: libqca2-devel
BuildRequires: libqjson-devel
@@ -87,21 +80,22 @@
BuildRequires: taglib-devel >= 1.7
BuildRequires: taglib-extras-devel >= 1.0
BuildRequires: tcpd-devel
-%if 0%{?suse_version}
BuildRequires: update-desktop-files
-%endif
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(libavcodec)
+BuildRequires: pkgconfig(libavformat)
+BuildRequires: pkgconfig(libavutil)
Requires: libtag-extras1 >= 1.0
Requires: phonon-backend
Requires: taglib >= 1.7
-# Make sure to require at least the version used for linking to avoid
undefined symbols at runtime
-%define required_libtag %(rpm -qf `ldd $(type -P tagreader) | awk
'/libtag.so.[0-9]/{ print $3 }'`)
-%requires_ge %{required_libtag}
Recommends: %{name}-lang = %{version}
Recommends: clamz
Recommends: qt4-qtscript
Provides: kde4-amarok = 2.0.90
Obsoletes: kde4-amarok <= 2.0.89
-%kde4_runtime_requires
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%requires_ge %{required_libtag}
+%{kde4_runtime_requires}
%description
Amarok is a media player for all kinds of media. This includes MP3, Ogg
@@ -109,6 +103,7 @@
.m3u or .pls files.
%lang_package
+
%prep
: required_libtag '%{required_libtag}'
%setup -q
@@ -127,7 +122,7 @@
%patch109 -p1
# Remove build time references so build-compare can do its work
-FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{S:99} '+%%b %%e %%Y')
+FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE99} '+%%b %%e %%Y')
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/main.cpp
%build
@@ -147,17 +142,15 @@
#bnc722284 amarok is not really a good player for audio-cds, remove the action
for solid
rm -f %{buildroot}%{_kde4_appsdir}/solid/actions/amarok-play-audiocd.desktop
- # Copy the icon for amzdownloader over from oxygen
- for i in 16 22 32 48
- do
+# Copy the icon for amzdownloader over from oxygen
+for i in 16 22 32 48
+do
mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/${i}x${i}/actions
cp %{_kde4_iconsdir}/oxygen/${i}x${i}/actions/download.png
%{buildroot}%{_kde4_iconsdir}/hicolor/${i}x${i}/actions/
- done
+done
-%if 0%{?suse_version}
%suse_update_desktop_file amarok Qt KDE AudioVideo Audio Player
%suse_update_desktop_file -r amzdownloader Qt KDE AudioVideo Audio Player
-%endif
%fdupes -s %{buildroot}
