[rpms/amarok] epel10.2: - amarok-2.2.1.90 (2.2.2 beta1)

[rpms/amarok] epel10.2: - amarok-2.2.1.90 (2.2.2 beta1)

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 7b9d9459612096948386fdc2f24f7cad62e2ad9a
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2009-12-10T16:36:44+00:00
Stats  : +23/-51 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/7b9d9459612096948386fdc2f24f7cad62e2ad9a?branch=epel10.2

Log:
- amarok-2.2.1.90 (2.2.2 beta1)

---
diff --git a/.cvsignore b/.cvsignore
index 4d738f0..6971e50 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-2.2.1.tar.bz2
+amarok-2.2.1.90.tar.bz2

diff --git a/amarok-2.0.90-qtscript_not_required.patch b/amarok-2.0.90-qtscript_not_required.patch
deleted file mode 100644
index 1cf3af7..0000000
--- a/amarok-2.0.90-qtscript_not_required.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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})
- 

diff --git a/amarok-2.2.1.90-qtscript_not_required.patch b/amarok-2.2.1.90-qtscript_not_required.patch
new file mode 100644
index 0000000..111c52b
--- /dev/null
+++ b/amarok-2.2.1.90-qtscript_not_required.patch
@@ -0,0 +1,14 @@
+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})
+ 

diff --git a/amarok.spec b/amarok.spec
index a1f5e6a..4c63f66 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -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@fedoraproject.org> - 2.2.1.90-1
+- amarok-2.2.1.90 (2.2.2 beta1)
+
 * Mon Nov 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 2.2.1-3 
 - rebuild (for qt-4.6.0-rc1, f13+)
 

diff --git a/playlist_default_layout_fix.diff b/playlist_default_layout_fix.diff
deleted file mode 100644
index 106f659..0000000
--- a/playlist_default_layout_fix.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/src/playlist/layouts/LayoutManager.cpp b/src/playlist/layouts/LayoutManager.cpp
-index b2903ee..541f989 100644
---- a/src/playlist/layouts/LayoutManager.cpp
-+++ b/src/playlist/layouts/LayoutManager.cpp
-@@ -55,6 +55,8 @@ LayoutManager::LayoutManager()
- 
-     KConfigGroup config = Amarok::config("Playlist Layout");
-     m_activeLayout = config.readEntry( "CurrentLayout", "Default" );
-+    if( !layouts().contains( m_activeLayout ) )
-+        m_activeLayout = "Default";
-     Playlist::ModelStack::instance()->top()->setGroupingCategory( activeLayout().groupBy() );
- }
- 
-diff --git a/src/playlist/layouts/PlaylistLayoutEditDialog.cpp b/src/playlist/layouts/PlaylistLayoutEditDialog.cpp
-index 166879c..03fd529 100644
---- a/src/playlist/layouts/PlaylistLayoutEditDialog.cpp
-+++ b/src/playlist/layouts/PlaylistLayoutEditDialog.cpp
-@@ -440,7 +440,10 @@ void PlaylistLayoutEditDialog::reject()     //SLOT
-     DEBUG_BLOCK
- 
-     debug() << "Applying initial layout: " << m_firstActiveLayout;
--    LayoutManager::instance()->setActiveLayout( m_firstActiveLayout );
-+    if( layoutListWidget->findItems( m_firstActiveLayout, Qt::MatchExactly ).isEmpty() )
-+        LayoutManager::instance()->setActiveLayout( "Default" );
-+    else
-+        LayoutManager::instance()->setActiveLayout( m_firstActiveLayout );
- 
-     QDialog::reject();
- }

diff --git a/sources b/sources
index 4ba33cd..95ee861 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f6f45f0c25f85f2a2a1fff169ac7193  amarok-2.2.1.tar.bz2
+0fb6c98618c91159a26e3f2e837ef132  amarok-2.2.1.90.tar.bz2