Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit amarok
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 20 Aug 2007 17:19:27 +0200
  • Message-id: <20070820151928.0AC45678182@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package amarok
checked in at Mon Aug 20 17:19:27 CEST 2007.

--------
--- KDE/amarok/amarok.changes   2007-08-19 18:33:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/amarok/amarok.changes  2007-08-20 16:57:24.085867000 +0200
@@ -1,0 +2,5 @@
+Mon Aug 20 16:25:56 CEST 2007 - ssommer@xxxxxxx
+
+- add support for the opensuse-codecs-installer
+
+-------------------------------------------------------------------

New:
----
  amarok-FrameworkVersion.diff
  amarok_xine-mp3_install.desktop
  amarok_yauap-mp3_install.desktop

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

Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.l27208/_old  2007-08-20 17:16:35.000000000 +0200
+++ /var/tmp/diff_new_pack.l27208/_new  2007-08-20 17:16:35.000000000 +0200
@@ -36,7 +36,7 @@
 Group:          Productivity/Multimedia/Sound/Players
 Summary:        Media Player for KDE
 Version:        1.4.7
-Release:        6
+Release:        8
 %if %suse_version > 1020
 Requires:       amarok-lang = %{version}
 Recommends:     libvisual-plugins
@@ -44,6 +44,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define mversion 0.5
 Source0:        %name-%version.tar.bz2
+Source1:        amarok_xine-mp3_install.desktop 
+Source2:        amarok_yauap-mp3_install.desktop 
 #Patch0:         1_3_BRANCH.diff
 Patch2:         use-system-icons.diff
 Patch3:         amarok-no-realaudio.diff
@@ -51,6 +53,7 @@
 Patch10:        default-engine.diff
 Patch11:        amarok-threadmanager.diff
 Patch12:        undefined-entity.diff
+Patch13:        amarok-FrameworkVersion.diff
 
 %description
 Amarok is a media player for all kinds of media. This includes MP3, Ogg
@@ -88,6 +91,7 @@
 Group:          Productivity/Multimedia/Sound/Players
 Summary:        Xine Output Plugin for Amarok
 Requires:       amarok = %version
+Recommends:     opensuse-codecs-installer
 Provides:       amarok_engine
 
 %description xine
@@ -124,6 +128,7 @@
 Group:          Productivity/Multimedia/Sound/Players
 Summary:        Yauap Output Plugin for amaroK
 Requires:       amarok = %version yauap
+Recommends:     opensuse-codecs-installer
 Provides:       yauap_engine
 
 %description yauap
@@ -152,6 +157,7 @@
 %patch12
 rm -rf doc/pl
 %endif
+%patch13 -p1 
 . /etc/opt/kde3/common_options
 update_admin --no-unsermake
 
@@ -177,6 +183,8 @@
 rm -v $RPM_BUILD_ROOT/opt/kde3/%_lib/ruby_lib/*.la
 rm -rf $RPM_BUILD_ROOT/opt/kde3/share/locale/xx
 %find_lang %name
+cp %{S:1} $RPM_BUILD_ROOT/opt/kde3/share/services
+cp %{S:2} $RPM_BUILD_ROOT/opt/kde3/share/services
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -252,6 +260,7 @@
 /opt/kde3/share/config.kcfg/xinecfg.kcfg
 /opt/kde3/%_lib/kde3/libamarok_xine-engine.*
 /opt/kde3/share/services/amarok_xine-engine.desktop
+/opt/kde3/share/services/amarok_xine-mp3_install.desktop
 %if 0
 
 %files gstreamer
@@ -272,9 +281,12 @@
 %defattr(-,root,root)
 /opt/kde3/%_lib/kde3/libamarok_yauap-engine_plugin.*
 /opt/kde3/share/services/amarok_yauap-engine_plugin.desktop
+/opt/kde3/share/services/amarok_yauap-mp3_install.desktop
 %endif
 
 %changelog
+* Mon Aug 20 2007 - ssommer@xxxxxxx
+- add support for the opensuse-codecs-installer
 * Sun Aug 19 2007 - stbinner@xxxxxxx
 - fix build on 10.0
 * Mon Aug 13 2007 - dmueller@xxxxxxx

++++++ amarok-FrameworkVersion.diff ++++++
diff -Naur amarok-1.4.7.org/amarok/src/engine/xine/xine-engine.cpp amarok-1.4.7/amarok/src/engine/xine/xine-engine.cpp
--- amarok-1.4.7.org/amarok/src/engine/xine/xine-engine.cpp     2007-08-20 14:06:33.000000000 +0200
+++ amarok-1.4.7/amarok/src/engine/xine/xine-engine.cpp 2007-08-20 14:14:06.000000000 +0200
@@ -78,6 +78,9 @@
         , m_fadeOutRunning ( false )
         , m_equalizerEnabled( false )
 {
+    int major,minor,sub;
+    xine_get_version(&major,&minor,&sub);
+    addPluginProperty( "FrameworkVersion", QString("%1.%2.%3").arg(major).arg(minor).arg(sub));
     addPluginProperty( "HasConfigure", "true" );
     addPluginProperty( "HasEqualizer", "true" );
     #ifndef __NetBSD__  // NetBSD does not offer audio mixing
diff -Naur amarok-1.4.7.org/amarok/src/enginecontroller.cpp amarok-1.4.7/amarok/src/enginecontroller.cpp
--- amarok-1.4.7.org/amarok/src/enginecontroller.cpp    2007-08-20 14:06:33.000000000 +0200
+++ amarok-1.4.7/amarok/src/enginecontroller.cpp        2007-08-20 15:31:17.000000000 +0200
@@ -35,6 +35,7 @@
 #include <kio/job.h>
 #include <kmessagebox.h>
 #include <krun.h>
+#include <kmacroexpander.h>
 
 #include <cstdlib>
 
@@ -277,6 +278,11 @@
             , KStdGuiItem::no()
             , "codecInstallWarning" ) == KMessageBox::Yes )
             {
+                   QMap<QString,QString> map;
+                   if(hasEngineProperty("FrameworkVersion")){
+                       map.insert("FrameworkVersion",engineProperty("FrameworkVersion"));
+                   }
+                   installScript = KMacroExpander::expandMacros(installScript, map);   
                     KRun::runCommand(installScript);
                     return true;
             }

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



Remember to have fun...

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

< Previous Next >