[rpms/amarok] epel10: - amarok-1.92 (amarok2 beta2)

[rpms/amarok] epel10: - amarok-1.92 (amarok2 beta2)

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10
Commit : 9fe66c3c5169654d1e53a4eae66f4f4c91270096
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2008-10-02T12:43:37+00:00
Stats  : +8/-102 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/9fe66c3c5169654d1e53a4eae66f4f4c91270096?branch=epel10

Log:
- amarok-1.92 (amarok2 beta2)

---
diff --git a/.cvsignore b/.cvsignore
index d883a5b..7b3f111 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-1.90.tar.bz2
+amarok-1.92.tar.bz2

diff --git a/amarok-1.90-lib64.patch b/amarok-1.90-lib64.patch
deleted file mode 100644
index f4c09bd..0000000
--- a/amarok-1.90-lib64.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -up amarok-1.90/src/scriptengine/generator/generator/qtscript_core.cmake.lib64 amarok-1.90/src/scriptengine/generator/generator/qtscript_core.cmake
---- amarok-1.90/src/scriptengine/generator/generator/qtscript_core.cmake.lib64	2008-08-19 18:15:25.000000000 -0500
-+++ amarok-1.90/src/scriptengine/generator/generator/qtscript_core.cmake	2008-08-20 10:26:42.000000000 -0500
-@@ -103,4 +103,4 @@ set_source_files_properties( ${Generated
- add_library( qtscript_core MODULE ${Generated_QtCore_SRCS} )
- add_dependencies( qtscript_core generator )
- target_link_libraries( qtscript_core ${QT_LIBRARIES})
--install( TARGETS qtscript_core DESTINATION lib/kde4/plugins/script )
-+install( TARGETS qtscript_core DESTINATION ${LIB_INSTALL_DIR}/kde4/plugins/script )
-diff -up amarok-1.90/src/scriptengine/generator/generator/qtscript_gui.cmake.lib64 amarok-1.90/src/scriptengine/generator/generator/qtscript_gui.cmake
---- amarok-1.90/src/scriptengine/generator/generator/qtscript_gui.cmake.lib64	2008-08-19 18:15:25.000000000 -0500
-+++ amarok-1.90/src/scriptengine/generator/generator/qtscript_gui.cmake	2008-08-20 10:26:42.000000000 -0500
-@@ -561,4 +561,4 @@ set_source_files_properties( ${Generated
- add_library( qtscript_gui MODULE ${Generated_QtGUI_SRCS} )
- add_dependencies( qtscript_gui generator )
- target_link_libraries( qtscript_gui ${QT_LIBRARIES})
--install( TARGETS qtscript_gui DESTINATION lib/kde4/plugins/script )
-+install( TARGETS qtscript_gui DESTINATION ${LIB_INSTALL_DIR}/kde4/plugins/script )
-diff -up amarok-1.90/src/scriptengine/generator/generator/qtscript_network.cmake.lib64 amarok-1.90/src/scriptengine/generator/generator/qtscript_network.cmake
---- amarok-1.90/src/scriptengine/generator/generator/qtscript_network.cmake.lib64	2008-08-19 18:15:25.000000000 -0500
-+++ amarok-1.90/src/scriptengine/generator/generator/qtscript_network.cmake	2008-08-20 10:26:42.000000000 -0500
-@@ -51,4 +51,4 @@ set_source_files_properties( ${Generated
- add_library( qtscript_network MODULE ${Generated_QtNetwork_SRCS} )
- add_dependencies( qtscript_network generator )
- target_link_libraries( qtscript_network ${QT_LIBRARIES})
--install( TARGETS qtscript_network DESTINATION lib/kde4/plugins/script )
-+install( TARGETS qtscript_network DESTINATION ${LIB_INSTALL_DIR}/kde4/plugins/script )
-diff -up amarok-1.90/src/scriptengine/generator/generator/qtscript_sql.cmake.lib64 amarok-1.90/src/scriptengine/generator/generator/qtscript_sql.cmake
---- amarok-1.90/src/scriptengine/generator/generator/qtscript_sql.cmake.lib64	2008-08-19 18:15:25.000000000 -0500
-+++ amarok-1.90/src/scriptengine/generator/generator/qtscript_sql.cmake	2008-08-20 10:26:42.000000000 -0500
-@@ -27,4 +27,4 @@ set_source_files_properties( ${Generated
- add_library( qtscript_sql MODULE ${Generated_QtSql_SRCS} )
- add_dependencies( qtscript_sql generator )
- target_link_libraries( qtscript_sql ${QT_LIBRARIES})
--install( TARGETS qtscript_sql DESTINATION lib/kde4/plugins/script )
-+install( TARGETS qtscript_sql DESTINATION ${LIB_INSTALL_DIR}/kde4/plugins/script )
-diff -up amarok-1.90/src/scriptengine/generator/generator/qtscript_uitools.cmake.lib64 amarok-1.90/src/scriptengine/generator/generator/qtscript_uitools.cmake
---- amarok-1.90/src/scriptengine/generator/generator/qtscript_uitools.cmake.lib64	2008-08-19 18:15:26.000000000 -0500
-+++ amarok-1.90/src/scriptengine/generator/generator/qtscript_uitools.cmake	2008-08-20 10:26:42.000000000 -0500
-@@ -7,4 +7,4 @@ set_source_files_properties( ${Generated
- add_library( qtscript_uitools MODULE ${Generated_QtUiTools_SRCS} )
- add_dependencies( qtscript_uitools generator )
- target_link_libraries( qtscript_uitools ${QT_LIBRARIES})
--install( TARGETS qtscript_uitools DESTINATION lib/kde4/plugins/script )
-+install( TARGETS qtscript_uitools DESTINATION ${LIB_INSTALL_DIR}/kde4/plugins/script )
-diff -up amarok-1.90/src/scriptengine/generator/generator/qtscript_webkit.cmake.lib64 amarok-1.90/src/scriptengine/generator/generator/qtscript_webkit.cmake
---- amarok-1.90/src/scriptengine/generator/generator/qtscript_webkit.cmake.lib64	2008-08-19 18:15:25.000000000 -0500
-+++ amarok-1.90/src/scriptengine/generator/generator/qtscript_webkit.cmake	2008-08-20 10:26:42.000000000 -0500
-@@ -17,4 +17,4 @@ set_source_files_properties( ${Generated
- add_library( qtscript_webkit MODULE ${Generated_QtWebkit_SRCS} )
- add_dependencies( qtscript_webkit generator )
- target_link_libraries( qtscript_webkit ${QT_LIBRARIES})
--install( TARGETS qtscript_webkit DESTINATION lib/kde4/plugins/script )
-+install( TARGETS qtscript_webkit DESTINATION ${LIB_INSTALL_DIR}/kde4/plugins/script )
-diff -up amarok-1.90/src/scriptengine/generator/generator/qtscript_xml.cmake.lib64 amarok-1.90/src/scriptengine/generator/generator/qtscript_xml.cmake
---- amarok-1.90/src/scriptengine/generator/generator/qtscript_xml.cmake.lib64	2008-08-19 18:15:25.000000000 -0500
-+++ amarok-1.90/src/scriptengine/generator/generator/qtscript_xml.cmake	2008-08-20 10:26:42.000000000 -0500
-@@ -48,4 +48,4 @@ set_source_files_properties( ${Generated
- add_library( qtscript_xml MODULE ${Generated_QtXML_SRCS} )
- add_dependencies( qtscript_xml generator )
- target_link_libraries( qtscript_xml ${QT_LIBRARIES})
--install( TARGETS qtscript_xml DESTINATION lib/kde4/plugins/script )
-+install( TARGETS qtscript_xml DESTINATION ${LIB_INSTALL_DIR}/kde4/plugins/script )
-diff -up amarok-1.90/src/scriptengine/generator/generator/qtscript_xmlpatterns.cmake.lib64 amarok-1.90/src/scriptengine/generator/generator/qtscript_xmlpatterns.cmake
---- amarok-1.90/src/scriptengine/generator/generator/qtscript_xmlpatterns.cmake.lib64	2008-08-19 18:15:25.000000000 -0500
-+++ amarok-1.90/src/scriptengine/generator/generator/qtscript_xmlpatterns.cmake	2008-08-20 10:26:42.000000000 -0500
-@@ -28,4 +28,4 @@ set_source_files_properties( ${Generated
- add_library( qtscript_xmlpatterns MODULE ${Generated_QtXMLPatterns_SRCS} )
- add_dependencies( qtscript_xmlpatterns generator )
- target_link_libraries( qtscript_xmlpatterns ${QT_LIBRARIES})
--install( TARGETS qtscript_xmlpatterns DESTINATION lib/kde4/plugins/script )
-+install( TARGETS qtscript_xmlpatterns DESTINATION ${LIB_INSTALL_DIR}/kde4/plugins/script )
-diff -up amarok-1.90/src/scripts/qtscript_debug/CMakeLists.txt.lib64 amarok-1.90/src/scripts/qtscript_debug/CMakeLists.txt
---- amarok-1.90/src/scripts/qtscript_debug/CMakeLists.txt.lib64	2008-08-19 18:14:57.000000000 -0500
-+++ amarok-1.90/src/scripts/qtscript_debug/CMakeLists.txt	2008-08-20 10:26:42.000000000 -0500
-@@ -10,5 +10,5 @@ install( PROGRAMS
- 
- install( PROGRAMS
-         debug/__init__.js
--        DESTINATION lib/kde4/plugins/script/amarok/qtscript_debug/debug
-+        DESTINATION ${LIB_INSTALL_DIR}/kde4/plugins/script/amarok/qtscript_debug/debug
- )
-\ No newline at end of file

diff --git a/amarok.spec b/amarok.spec
index ecf4c89..bb4f1a5 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,7 +1,7 @@
 
 Name:    amarok
 Summary: Media player
-Version: 1.90
+Version: 1.92
 Release: 1%{?dist}
 
 Group: 	 Applications/Multimedia
@@ -10,8 +10,6 @@ Url:     http://amarok.kde.org/
 Source0: http://download.kde.org/unstable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: amarok-1.90-lib64.patch
-
 BuildRequires: alsa-lib-devel
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -35,17 +33,14 @@ BuildRequires: libusb-devel
 BuildRequires: libvisual-devel
 BuildRequires: libxml2-devel
 BuildRequires: loudmouth-devel
-BuildRequires: mysql-devel
+BuildRequires: mysql-embedded-devel
 BuildRequires: soprano-devel
 BuildRequires: taglib-devel
 
-%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
-#Requires: kdelibs4 >= 4.1.0
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
-Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
-Obsoletes: amarok-devel < %{version}-%{release}
+Obsoletes: amarok-devel < 1.4.9 
 Obsoletes: amarok-konqueror < 1.5
 Obsoletes: amarok-visualisation < 1.5
 
@@ -57,17 +52,9 @@ Amarok is a multimedia player with:
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
-
 %prep
 %setup -q 
 
-# ugh, hard-coded prefix/lib (LIB_SUFFIX vs LIB_INSTALL_DIR ?)
-#sed -i --in-place=.lib64 -e 's| lib/kde4| ${LIB_INSTALL_DIR}/kde4|' \
-#  src/scriptengine/generator/generator/*.cmake \
-#  src/scripts/qtscript_debug/CMakeLists.txt
-%patch1 -p1 -b .lib64
-
-
 
 %build
 mkdir -p %{_target_platform}
@@ -126,7 +113,6 @@ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/kde4/plugins/script/amarok/
 %{_kde4_libdir}/kde4/plugins/script/*.so
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/strigi/*
@@ -134,6 +120,9 @@ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
 %changelog
+* Thu Oct 02 2008 Rex Dieter <rdieter@fedoraproject.org> - 1.92-1
+- amarok-1.92 (amarok2 beta2)
+
 * Wed Aug 20 2008 Rex Dieter <rdieter@fedoraproject.org> - 1.90-1
 - amarok-1.90 (amarok2 beta)
 

diff --git a/sources b/sources
index 7d8220a..80e2174 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-823fcaea9450110bc9ea9fceba674b4e  amarok-1.90.tar.bz2
+235a8d3adcb691f46d25df44d7979efd  amarok-1.92.tar.bz2