Mailinglist Archive: opensuse-commit (817 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package kde4-amarok for openSUSE:Factory
checked in at Thu Dec 18 15:12:17 CET 2008.


--------
--- KDE/kde4-amarok/kde4-amarok.changes 2008-12-14 20:38:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/kde4-amarok/kde4-amarok.changes        
2008-12-15 22:03:27.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Dec 15 17:00:19 CET 2008 - dmueller@xxxxxxx
+
+- add missing requirement on qt4-sql-sqlite
+- use mysql embedded instead of mysql server
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  link-mysql-embedded.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kde4-amarok.spec ++++++
--- /var/tmp/diff_new_pack.k18772/_old  2008-12-18 15:11:33.000000000 +0100
+++ /var/tmp/diff_new_pack.k18772/_new  2008-12-18 15:11:33.000000000 +0100
@@ -36,14 +36,16 @@
 Group:          Productivity/Multimedia/Sound/Players
 Summary:        Media Player for KDE
 Version:        2.0
-Release:        2
+Release:        3
 Source0:        amarok-%version.tar.bz2
 Patch:          amarok.cv.weirdness.patch
 Patch1:         amarok.elide.highcpu.patch
 Patch2:         fix-mtp-crash.patch
+Patch3:         link-mysql-embedded.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %kde4_runtime_requires 
 Requires:       kde4-amarok-lang = %{version}
+Requires:       libqt4-sql-sqlite
 
 %description
 Amarok is a media player for all kinds of media. This includes MP3, Ogg
@@ -65,6 +67,7 @@
 %patch -p1
 %patch1 -p1
 %patch2 -p0
+%patch3
 
 %build
 %ifarch ppc ppc64
@@ -131,6 +134,9 @@
 %_kde_share_dir/services/amaroklastfm.protocol
 
 %changelog
+* Mon Dec 15 2008 dmueller@xxxxxxx
+- add missing requirement on qt4-sql-sqlite
+- use mysql embedded instead of mysql server
 * Sun Dec 14 2008 meissner@xxxxxxx
 - fixed a crash with MTP devices without sufficient permissions.
   bnc#457931

++++++ link-mysql-embedded.diff ++++++
--- src/collection/sqlcollection/CMakeLists.txt
+++ src/collection/sqlcollection/CMakeLists.txt
@@ -63,11 +63,6 @@ target_link_libraries(amarok_collection-
     ${KDE4_THREADWEAVER_LIBRARIES}
     ${CMAKE_DL_LIBS}
     ${MYSQL_EMBEDDED_LIBRARIES}
-    #this line may be needed on Debian or other systems where mysql is compiled
-    #in the prescence of yassl. However it seems to cause problems for other 
people,
-    #so its been disabled.
-    #See http://bugs.mysql.com/bug.php?id=21489
-    ${MYSQL_LIBRARIES}
     ${ZLIB_LIBRARIES}
 )
 

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx