rpms/amarok/devel amarok-2.0.90-qtscript_not_required.patch, NONE, 1.1 amarok.spec, 1.146, 1.147

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12246

Modified Files:
	amarok.spec 
Added Files:
	amarok-2.0.90-qtscript_not_required.patch 
Log Message:
hack around qtscriptbindings check at buildtime


amarok-2.0.90-qtscript_not_required.patch:

--- NEW FILE amarok-2.0.90-qtscript_not_required.patch ---
diff -up amarok-2.0.90/CMakeLists.txt.qtscript_not_required amarok-2.0.90/CMakeLists.txt
--- amarok-2.0.90/CMakeLists.txt.qtscript_not_required	2009-04-06 16:29:12.000000000 -0500
+++ amarok-2.0.90/CMakeLists.txt	2009-04-10 13:00:07.000000000 -0500
@@ -38,8 +38,8 @@ if( WITH_PLAYER )
 
     macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.2.0" "" )
 
-    find_package( QtScriptQtBindings REQUIRED )
-    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" TRUE "" "" )
+    macro_optional_find_package(QtScriptQtBindings)
+    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" FALSE "" "" )
 
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- amarok.spec	10 Apr 2009 15:31:58 -0000	1.146
+++ amarok.spec	10 Apr 2009 18:02:46 -0000	1.147
@@ -10,6 +10,8 @@
 Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch50: amarok-2.0.90-qtscript_not_required.patch
+
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -20,14 +22,13 @@
 BuildRequires: libmtp-devel >= 0.3.0
 %endif
 %if 0%{?fedora} > 10
-#BuildRequires: libgpod-devel >= 0.7.0
+BuildRequires: libgpod-devel
 %endif
 BuildRequires: libnjb-devel
 BuildRequires: libusb-devel
 BuildRequires: libxml2-devel
 BuildRequires: loudmouth-devel
 BuildRequires: mysql-embedded-devel
-BuildRequires: qtscriptgenerator
 BuildRequires: soprano-devel
 BuildRequires: taglib-devel
 BuildRequires: taglib-extras-devel
@@ -60,6 +61,8 @@
 %prep
 %setup -q
 
+%patch50 -p1 -b .qtscript_not_required
+
 
 %build
 mkdir -p %{_target_platform}