rpms/amarok/devel amarok-2.2.1.90-qtscript_not_required.patch, NONE, 1.1 .cvsignore, 1.53, 1.54 amarok.spec, 1.175, 1.176 sources, 1.54, 1.55 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/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27150

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/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	12 Nov 2009 13:03:08 -0000	1.53
+++ .cvsignore	10 Dec 2009 16:36:44 -0000	1.54
@@ -1 +1 @@
-amarok-2.2.1.tar.bz2
+amarok-2.2.1.90.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- amarok.spec	23 Nov 2009 16:28:45 -0000	1.175
+++ amarok.spec	10 Dec 2009 16:36:44 -0000	1.176
@@ -1,19 +1,18 @@
 
 Name:    amarok
 Summary: Media player
-Version: 2.2.1
-Release: 3%{?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
@@ -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,9 @@ 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+)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	12 Nov 2009 13:03:08 -0000	1.54
+++ sources	10 Dec 2009 16:36:44 -0000	1.55
@@ -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 ---