[cantata] SPEC cleanup #1

Fri Apr 11 02:57:57 UTC 2014

commit d05bc6aa5e199712b552d0a3502fb7472778bbea
Author: Christopher Meng <i at cicku.me>
Date:   Fri Apr 11 10:57:19 2014 +0800

    SPEC cleanup #1

 .gitignore   |    1 +
 cantata.spec |  108 ++++++++++++++++++++++++++++++++--------------------------
 sources      |    2 +-
 3 files changed, 62 insertions(+), 49 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 4f3c280..bcf4c3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /cantata-1.2.2.tar.bz2
+/cantata-1.3.3.tar.bz2
diff --git a/cantata.spec b/cantata.spec
index e846e8c..269e682 100644
--- a/cantata.spec
+++ b/cantata.spec
@@ -1,86 +1,100 @@
-
 # define to enable kde integration
-%define kde 1
+%global kde 1
 
 %if 0%{?fedora} > 17 || 0%{?rhel} > 6
-%define udisks2 1
+%global udisks2 1
 %endif
 
-Summary: Client for the Music Player Daemon (MPD)
-Name:    cantata
-Version: 1.2.2
-Release: 2%{?dist}
-
-License: GPLv2+
-#URL:    http://kde-apps.org/content/show.php/Cantata?content=147733
-URL:     http://code.google.com/p/cantata/
-Source0: http://cantata.googlecode.com/files/cantata-%{version}.tar.bz2
-Patch0:  %{name}-1.2.2-system-qtiocompressor.patch
+Name:           cantata
+Version:        1.3.3
+Release:        1%{?dist}
+Summary:        Music Player Daemon (MPD) graphical client
+License:        GPLv2+
+URL:            http://code.google.com/p/cantata/
+Source0:        http://cantata.googlecode.com/files/cantata-%{version}.tar.bz2
+Patch0:         %{name}-1.2.2-system-qtiocompressor.patch
 
 ## upstreamable patches
 # s|^#!/usr/bin/env perl|#!/usr/bin/perl|
-Patch101: cantata-0.9.1-perl_env.patch
+Patch101:       cantata-0.9.1-perl_env.patch
 
 # fix kde support
-Patch102: cantata-1.2.0-kde4_includes.patch
+# Patch102:       cantata-1.2.0-kde4_includes.patch
 
 # pkgconfig hints for libmusicbrainz5
-Patch103: cantata-1.2.0-libmusicbrainz5_cflags.patch
+# Patch103:       cantata-1.2.0-libmusicbrainz5_cflags.patch
 
-BuildRequires: cdparanoia-devel
-BuildRequires: gettext
+BuildRequires:  cdparanoia-devel
+BuildRequires:  gettext
 %if 0%{?kde}
-BuildRequires: kdelibs4-devel >= 4.7
+BuildRequires:  kdelibs4-devel >= 4.7
 %endif
-BuildRequires: pkgconfig(taglib)
-BuildRequires: pkgconfig(taglib-extras)
-BuildRequires: pkgconfig(libcddb)
-BuildRequires: pkgconfig(libmtp)
-BuildRequires: pkgconfig(libmusicbrainz5)
-BuildRequires: pkgconfig(phonon)
-BuildRequires: pkgconfig(QJson)
-BuildRequires: pkgconfig(QtWebKit)
-BuildRequires: qtiocompressor-devel
+BuildRequires:  pkgconfig(libcddb)
+BuildRequires:  pkgconfig(libmtp)
+BuildRequires:  pkgconfig(libmusicbrainz5)
+BuildRequires:  pkgconfig(phonon)
+BuildRequires:  pkgconfig(QJson)
+BuildRequires:  pkgconfig(QtWebKit)
+BuildRequires:  pkgconfig(taglib)
+BuildRequires:  pkgconfig(taglib-extras)
+BuildRequires:  qtiocompressor-devel
+BuildRequires:  qtsingleapplication-devel
+BuildRequires:  systemd-devel
 
 %description
-Cantata is a (yet another!) client for the music player daemon (MPD). 
-
+Cantata is a graphical client for the music player daemon (MPD). 
+
+Features:
+* Multiple MPD collections.
+* Highly customisable layout.
+* Songs grouped by album in play queue.
+* Context view to show artist, album, and song information of current track.
+* Simple tag editor.
+* File organizer - use tags to organize files and folders.
+* Ability to calculate ReplyGain tags.
+* Dynamic playlists.
+* Online services; Jamendo, Magnatune, SoundCloud, and Podcasts.
+* Radio stream support - with the ability to search for streams via TuneIn 
+and ShoutCast.
+* USB-Mass-Storage and MTP device support.
+* Audio CD ripping and playback.
+* Playback of non-MPD songs, via simple in-built HTTP server.
+* MPRISv2 DBUS interface.
+* Support for KDE global shortcuts (KDE builds), GNOME media keys, and generic
+media keys (via Qxt support)
+* Ubuntu/ambiance theme integration.
 
 %prep
 %setup -q
 %patch0 -p1 -b .system-qtiocompressor
 %patch101 -p1 -b .perl_env
-%patch102 -p1 -b .kde4_includes
-%patch103 -p1 -b .libmusicbrainz5_cflags
-rm -r 3rdparty
-
+rm -rf 3rdparty/
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-CXXFLAGS="$RPM_OPT_FLAGS -I/usr/include/QtSolutions" # see bug 1077936
+CXXFLAGS="%{optflags} -I/usr/include/QtSolutions" # see bug 1077936
 %{cmake_kde4} \
-  -DENABLE_KDE:BOOL=%{?kde:ON}%{!?kde:OFF} \
-  -DENABLE_FFMPEG:BOOL=OFF \
-  -DENABLE_MPG123:BOOL=OFF \
-  -DENABLE_HTTP_STREAM_PLAYBACK:BOOL=ON \
-  %{?udisks2:-DENABLE_UDISKS2:BOOL=ON} \
+  -DENABLE_KDE=%{?kde:ON}%{!?kde:OFF} \
+  -DENABLE_PROXY_CONFIG=ON \
+  -DENABLE_REMOTE_DEVICES=ON \
+  -DENABLE_FFMPEG=OFF \
+  -DENABLE_MPG123=OFF \
+  -DENABLE_HTTP_STREAM_PLAYBACKON \
+  %{?udisks2:-DENABLE_UDISKS2=ON} \
   ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
-
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang cantata %{!?kde:--with-qt} %{?kde:--with-kde} --all-name || touch %%{name}.lang
-
+%find_lang %{name} %{!?kde:--with-qt} %{?kde:--with-kde} --all-name || touch %%{name}.lang
 
 %check
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/%{?kde:kde4}/cantata.desktop
 
-
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
@@ -93,9 +107,8 @@ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 fi
 
-%files -f cantata.lang
-%doc LICENSE
-%doc AUTHORS ChangeLog README TODO
+%files -f %{name}.lang
+%doc AUTHORS ChangeLog LICENSE README TODO
 %{_kde4_bindir}/cantata
 %{_kde4_datadir}/applications/%{?kde:kde4}/cantata.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
@@ -104,7 +117,6 @@ fi
 %dir %{_kde4_appsdir}/solid/actions/
 %{_kde4_appsdir}/solid/actions/cantata-play-audiocd.desktop
 
-
 %changelog
 * Tue Mar 18 2014 Ville Skyttä <ville.skytta at iki.fi> - 1.2.2-2
 - Use system qtiocompressor instead of bundled one
diff --git a/sources b/sources
index c60a66c..9ed8bf8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7b6f73cbd97c8e8c3dcf05a1f3010c3  cantata-1.2.2.tar.bz2
+67053cfde9eb5c821483acc9c4961e36  cantata-1.3.3.tar.bz2
