[cantata] more build fixes

Rex Dieter rdieter at fedoraproject.org
Sun Jun 8 04:10:06 UTC 2014


commit 63ffcd4fa00ceb4fa1d7556b971bae1034601090
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Jun 7 23:08:48 2014 -0500

    more build fixes
    
    - explicit qt4 build
    - (Build)Requires: media-player-info
    - add %%_qt4_bindir to $PATH

 cantata.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/cantata.spec b/cantata.spec
index fa3102f..fbf92f6 100644
--- a/cantata.spec
+++ b/cantata.spec
@@ -2,6 +2,7 @@
 # kde build FTBFS at the moment (as of 1.3.4)
 #global kde 1
 #global qt5 1
+%global qt4 1
 
 %if 0%{?fedora} > 17 || 0%{?rhel} > 6
 %global udisks2 1
@@ -44,6 +45,7 @@ BuildRequires: pkgconfig(phonon4qt5)
 BuildRequires: pkgconfig(Qt5DBus) pkgconfig(Qt5Gui) pkgconfig(Qt5Network) pkgconfig(Qt5Xml)
 BuildRequires: pkgconfig(Qt5WebKit)
 %endif
+BuildRequires: media-player-info
 BuildRequires: pkgconfig(libcddb)
 BuildRequires: pkgconfig(libmtp)
 BuildRequires: pkgconfig(libmusicbrainz5)
@@ -52,6 +54,8 @@ BuildRequires: pkgconfig(taglib)
 BuildRequires: pkgconfig(taglib-extras)
 BuildRequires: systemd-devel
 
+Requires: media-player-info
+
 
 %description
 Cantata is a graphical client for the music player daemon (MPD).
@@ -92,6 +96,7 @@ rm -rfv 3rdparty/{qtsingleapplication,qxt}/
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
+PATH="%{_qt4_bindir}:$PATH" ; export PATH ;
 CXXFLAGS="%{optflags} -I/usr/include/QtSolutions" # see bug 1077936
 %{cmake} \
   -DENABLE_KDE:BOOL=%{?kde:ON}%{!?kde:OFF} \


More information about the scm-commits mailing list