rpms/amarok/F-11 amarok-2.2.1.90-qtscript_not_required.patch, NONE, 1.1 .cvsignore, 1.47, 1.48 amarok.spec, 1.158, 1.159 sources, 1.49, 1.50 amarok-2.0.90-qtscript_not_required.patch, 1.1, NONE playlist_default_layout_fix.diff, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5472

Modified Files:
	.cvsignore amarok.spec sources 
Added Files:
	amarok-2.2.1.90-qtscript_not_required.patch 
Removed Files:
	amarok-2.0.90-qtscript_not_required.patch 
	playlist_default_layout_fix.diff 
Log Message:
* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.1.90-1
- amarok-2.2.1.90 (2.2.2 beta1)


amarok-2.2.1.90-qtscript_not_required.patch:
 CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE amarok-2.2.1.90-qtscript_not_required.patch ---
diff -up amarok-2.2.1.90/CMakeLists.txt.qtscript_not_required amarok-2.2.1.90/CMakeLists.txt
--- amarok-2.2.1.90/CMakeLists.txt.qtscript_not_required	2009-12-10 04:45:37.000000000 -0600
+++ amarok-2.2.1.90/CMakeLists.txt	2009-12-10 09:42:21.253183224 -0600
@@ -75,8 +75,8 @@ if( WITH_PLAYER )
 
     macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.3.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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	12 Nov 2009 13:31:28 -0000	1.47
+++ .cvsignore	21 Dec 2009 14:35:01 -0000	1.48
@@ -1 +1 @@
-amarok-2.2.1.tar.bz2
+amarok-2.2.1.90.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/amarok.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- amarok.spec	16 Nov 2009 15:29:46 -0000	1.158
+++ amarok.spec	21 Dec 2009 14:35:01 -0000	1.159
@@ -1,19 +1,18 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.2.1
-Release: 2%{?dist}
+Version: 2.2.1.90
+Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
 Url:     http://amarok.kde.org/
-Source0: http://download.kde.org/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+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
+Patch50: amarok-2.2.1.90-qtscript_not_required.patch
 
 ## upstream patches
-Patch100: playlist_default_layout_fix.diff
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -34,7 +33,7 @@ BuildRequires: mysql-embedded-devel
 BuildRequires: qca2-devel
 BuildRequires: soprano-devel
 BuildRequires: taglib-devel >= 1.6
-BuildRequires: taglib-extras-devel >= 1.0.0
+BuildRequires: taglib-extras-devel >= 1.0.1
 
 %global kde4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 BuildRequires: qtscriptbindings
@@ -83,7 +82,6 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
-%patch100 -p1 -b .playlist_default_layout_fix
 
 
 %build
@@ -175,6 +173,12 @@ fi
 
 
 %changelog
+* Thu Dec 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.1.90-1
+- amarok-2.2.1.90 (2.2.2 beta1)
+
+* Mon Nov 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.1-3 
+- rebuild (for qt-4.6.0-rc1, f13+)
+
 * Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.1-2
 - playlist_default_layout_fix.diff (kde#211717)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-11/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	12 Nov 2009 13:31:29 -0000	1.49
+++ sources	21 Dec 2009 14:35:02 -0000	1.50
@@ -1 +1 @@
-4f6f45f0c25f85f2a2a1fff169ac7193  amarok-2.2.1.tar.bz2
+0fb6c98618c91159a26e3f2e837ef132  amarok-2.2.1.90.tar.bz2


--- amarok-2.0.90-qtscript_not_required.patch DELETED ---


--- playlist_default_layout_fix.diff DELETED ---