commit amarok for openSUSE:Factory
Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at Mon Jun 28 12:08:27 CEST 2010. -------- --- KDE/amarok/amarok.changes 2010-05-13 14:40:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/amarok/amarok.changes 2010-06-25 11:39:52.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Jun 25 09:31:43 UTC 2010 - beineri@opensuse.org + +- fix build for <11.3 + +------------------------------------------------------------------- +Mon Jun 21 20:50:56 UTC 2010 - cmorve69@yahoo.es + +- Make it the default media player ONLY for audio files + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.ote72X/_old 2010-06-28 12:06:36.000000000 +0200 +++ /var/tmp/diff_new_pack.ote72X/_new 2010-06-28 12:06:36.000000000 +0200 @@ -30,7 +30,9 @@ BuildRequires: qt4-qtscript taglib-extras-devel BuildRequires: libgpod-devel >= 0.7.0 BuildRequires: liblastfm-devel +%if %suse_version > 1120 BuildRequires: libksuseinstall-devel +%endif %if %suse_version > 1110 BuildRequires: libmysqld-devel %endif @@ -44,7 +46,7 @@ Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE Version: 2.3.0 -Release: 4 +Release: 5 Source0: %{name}-%{version}.tar.bz2 Source100: %{name}-rpmlintrc Patch3: errmsg-mysql-embedded.diff @@ -96,7 +98,9 @@ %endif %patch5 -p0 %patch6 -p0 +%if %suse_version > 1120 %patch7 -p1 +%endif %patch8 %build @@ -148,6 +152,7 @@ %_libdir/strigi/strigita_audible.so %_libdir/strigi/strigita_mp4.so %{_datadir}/applications/kde4/amarok.desktop +%{_datadir}/applications/kde4/amarokNoAudio.desktop %{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml ++++++ initial-preference.diff ++++++ --- /var/tmp/diff_new_pack.ote72X/_old 2010-06-28 12:06:36.000000000 +0200 +++ /var/tmp/diff_new_pack.ote72X/_new 2010-06-28 12:06:36.000000000 +0200 @@ -1,9 +1,218 @@ ---- src/amarok.desktop.sav 2010-03-11 00:12:15.000000000 +0100 -+++ src/amarok.desktop 2010-05-13 14:32:51.452054444 +0200 -@@ -178,5 +178,6 @@ MimeType=audio/aac;audio/mp4;audio/mpeg; +Index: src/amarok.desktop +=================================================================== +--- src/amarok.desktop.orig ++++ src/amarok.desktop +@@ -174,9 +174,12 @@ Comment[x-test]=xxAmarok - Rediscover Yo + Comment[zh_CN]=Amarok - 重新发现您的音乐! + Comment[zh_TW]=Amarok - 重新探索您的音樂世界! + Icon=amarok +-MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/x-ms-asf;application/x-ogm-audio;audio/x-vorbis+ogg;application/ogg;audio/ogg; ++#I am going to let Amarok open audio/mpegurl (application/m3u) since I expect most .m3u files to contain only audio tracks ++#Even less sure about audio/x-scpls (application/pls), but let Amarok open it until someone opens a bug report ++MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;application/x-ogm-audio;audio/x-vorbis+ogg;audio/ogg; X-DocPath=amarok/index.html X-KDE-Keywords=music,podcast X-KDE-Protocols=http +InitialPreference=5 Terminal=false Categories=Qt;KDE;AudioVideo;Audio;Player; +Index: src/amarokNoAudio.desktop +=================================================================== +--- /dev/null ++++ src/amarokNoAudio.desktop +@@ -0,0 +1,183 @@ ++[Desktop Entry] ++Type=Application ++Version=1.0 ++Name=Amarok ++Name[be]=Amarok ++Name[bg]=Amarok ++Name[ca]=Amarok ++Name[ca@valencia]=Amarok ++Name[cs]=Amarok ++Name[csb]=Amarok ++Name[da]=Amarok ++Name[de]=Amarok ++Name[el]=AmaroK ++Name[en_GB]=Amarok ++Name[eo]=Amarok ++Name[es]=Amarok ++Name[et]=Amarok ++Name[eu]=Amarok ++Name[fi]=Amarok ++Name[fr]=Amarok ++Name[ga]=Amarok ++Name[gl]=Amarok ++Name[he]=Amarok ++Name[hi]=अमारॉक ++Name[hne]=अमाराक ++Name[hu]=Amarok ++Name[is]=Amarok ++Name[it]=Amarok ++Name[ja]=Amarok ++Name[km]=Amarok ++Name[ko]=Amarok ++Name[ku]=Amarok ++Name[lt]=Amarok ++Name[lv]=Amarok ++Name[ms]=Amarok ++Name[nb]=Amarok ++Name[nds]=Amarok ++Name[ne]=अमारोक ++Name[nl]=Amarok ++Name[nn]=Amarok ++Name[oc]=Amarok ++Name[pa]=ਅਮਰੋਕ ++Name[pl]=Amarok ++Name[pt]=Amarok ++Name[pt_BR]=Amarok ++Name[ro]=Amarok ++Name[ru]=Amarok ++Name[sk]=Amarok ++Name[sl]=Amarok ++Name[sr]=Амарок ++Name[sr@ijekavian]=Амарок ++Name[sr@ijekavianlatin]=Amarok ++Name[sr@latin]=Amarok ++Name[sv]=Amarok ++Name[th]=แอมอะร็อก ++Name[tr]=Amarok ++Name[uk]=Amarok ++Name[wa]=Amarok ++Name[x-test]=xxAmarokxx ++Name[zh_CN]=Amarok ++Name[zh_TW]=Amarok ++GenericName=Audio Player ++GenericName[be]=Аўдыёпрайгравальнік ++GenericName[bg]=Аудио плеър ++GenericName[ca]=Reproductor d'àudio ++GenericName[ca@valencia]=Reproductor d'àudio ++GenericName[cs]=Zvukový přehrávač ++GenericName[csb]=Grôcz aùdio ++GenericName[da]=Lydafspiller ++GenericName[de]=Medienwiedergabe ++GenericName[el]=Αναπαραγωγή ήχου ++GenericName[en_GB]=Audio Player ++GenericName[eo]=Sonludilo ++GenericName[es]=Reproductor de audio ++GenericName[et]=Helifailide mängija ++GenericName[eu]=Audio erreproduzigailua ++GenericName[fi]=Musiikkisoitin ++GenericName[fr]=Lecteur audio ++GenericName[ga]=Seinnteoir Fuaime ++GenericName[gl]=Reprodutor de audio ++GenericName[he]=נגן שמע ++GenericName[hne]=आडियो प्लेयर ++GenericName[hu]=Zenelejátszó ++GenericName[is]=Tónlistarspilari ++GenericName[it]=Lettore audio ++GenericName[ja]=オーディオプレーヤー ++GenericName[km]=កម្មវិធីចាក់អូឌីយ៉ូ ++GenericName[ko]=오디오 재생기 ++GenericName[ku]=Lêdarê Muzîkê ++GenericName[lt]=Muzikos grotuvas ++GenericName[lv]=Audio atskaņotājs ++GenericName[mai]=आडियो प्लेयर ++GenericName[ms]=Pemain Audio ++GenericName[nb]=Lydavspiller ++GenericName[nds]=Klangafspeler ++GenericName[ne]=अडियो प्लेयर ++GenericName[nl]=Audiospeler ++GenericName[nn]=Musikkspelar ++GenericName[pa]=ਆਡੀਓ ਪਲੇਅਰ ++GenericName[pl]=Odtwarzacz audio ++GenericName[pt]=Leitor de Áudio ++GenericName[pt_BR]=Reprodutor de Áudio ++GenericName[ro]=Redare audio ++GenericName[ru]=Аудио проигрыватель ++GenericName[sk]=Audio prehrávač ++GenericName[sl]=Predvajalnik glasbe ++GenericName[sr]=Аудио плејер ++GenericName[sr@ijekavian]=Аудио плејер ++GenericName[sr@ijekavianlatin]=Audio plejer ++GenericName[sr@latin]=Audio plejer ++GenericName[sv]=Ljudspelare ++GenericName[th]=เครื่องเล่นเสียง ++GenericName[tr]=Müzik Çalar ++GenericName[uk]=Аудіопрогравач ++GenericName[wa]=Djouweu d' son ++GenericName[x-test]=xxAudio Playerxx ++GenericName[zh_CN]=音频播放器 ++GenericName[zh_TW]=音效播放器 ++Exec=amarok %U ++Comment=Amarok - Rediscover Your Music! ++Comment[be]=Amarok - адкрыйце для сябе сваю музыку! ++Comment[bg]=Amarok - преоткрийте музиката! ++Comment[ca]=Amarok - Redescobreix la teva música! ++Comment[ca@valencia]=Amarok - Redescobreix la teva música! ++Comment[cs]=AmaroK - znovu objevte svou hudbu! ++Comment[csb]=Amarok - òdrëjë znowa swòją mùzykã ++Comment[da]=Amarok - Genopdag din musik! ++Comment[de]=Amarok - Musik neu erleben! ++Comment[el]=Amarok - Ξαναανακαλήψτε τη μουσική σας! ++Comment[en_GB]=Amarok - Rediscover Your Music! ++Comment[eo]=Amarok - Remalkovru vian muzikon! ++Comment[es]=Amarok - ¡Vuelve a descubrir tu música! ++Comment[et]=Amarok - naudi oma muusikat! ++Comment[eu]=Amarok - Biraurkitu zure musika! ++Comment[fi]=Amarok – löydä musiikkisi uudelleen ++Comment[fr]=Amarok - Redécouvrez votre musique ! ++Comment[ga]=Amarok - Athaimsigh do chuid Ceoil! ++Comment[gl]=Amarok - Descubra de novo a música! ++Comment[he]=Amarok - גלה מחדש את המוזיקה ++Comment[hne]=अमाराक - अपन संगीत ल फिर से खोजव! ++Comment[hu]=Amarok - fedezze fel a zenéjét ++Comment[is]=Amarok - Enduruppgötvaðu tónlistina þína! ++Comment[it]=Amarok - Riscopri la tua musica! ++Comment[ja]=Amarok - あなたの音楽を再発見 ++Comment[km]=Amarok - រកឃើញតន្ត្រីរបស់អ្នកឡើងវិញ ! ++Comment[ko]=Amarok - 음악의 재발견! ++Comment[ku]=Amarok - muzîkê ji nû ve keşif bike ++Comment[lt]=Amarok – atraskite savo muziką iš naujo! ++Comment[lv]=Amarok - atklāj savu mūziku! ++Comment[ms]=Amarok - Temui Muzik Anda! ++Comment[nb]=Amarok – Oppdag musikken din på nytt! ++Comment[nds]=Amarok - Beleev Dien Musik nieg! ++Comment[ne]=अमारोक - आफ्नो बाजा फेरि पत्ता लगाउनुहोस्! ++Comment[nl]=Amarok - Herontdek uw muziek! ++Comment[nn]=Amarok – gjenoppdag musikken din! ++Comment[pa]=ਅਮਰੋਕ - ਆਪਣਾ ਸੰਗੀਤ ਮੁੜ ਲੱਭੋ! ++Comment[pl]=Amarok - odkryj na nowo swoją muzykę! ++Comment[pt]=Amarok - Descubra de Novo a sua Música! ++Comment[pt_BR]=Amarok - Redescubra Sua Música! ++Comment[ro]=Amarok - Redescoperă-ți muzica! ++Comment[ru]=Amarok - посмотрите на музыку по-другому ++Comment[sk]=Amarok - Znova objavte svoju hudbu! ++Comment[sl]=Amarok - Znova odkrijte svojo glasbo! ++Comment[sr]=Амарок — откријте своју музику! ++Comment[sr@ijekavian]=Амарок — откријте своју музику! ++Comment[sr@ijekavianlatin]=Amarok — otkrijte svoju muziku! ++Comment[sr@latin]=Amarok — otkrijte svoju muziku! ++Comment[sv]=Amarok - Återupptäck din musik! ++Comment[th]=แอมอะร็อก - ค้นพบมิติใหม่ในดนตรีของคุณ ! ++Comment[tr]=Amarok - Müziğinizi yeniden keşfedin! ++Comment[uk]=Amarok — відкрийте свою музику знову! ++Comment[wa]=Amarok - Ridiscovroz vosse muzike! ++Comment[x-test]=xxAmarok - Rediscover Your Music!xx ++Comment[zh_CN]=Amarok - 重新发现您的音乐! ++Comment[zh_TW]=Amarok - 重新探索您的音樂世界! ++Icon=amarok ++MimeType=video/x-ms-asf;application/ogg; ++NoDisplay=true ++X-DocPath=amarok/index.html ++X-KDE-Keywords=music,podcast ++X-KDE-Protocols=http ++Terminal=false ++Categories=Qt;KDE;AudioVideo;Audio;Player; +Index: src/CMakeLists.txt +=================================================================== +--- src/CMakeLists.txt.orig ++++ src/CMakeLists.txt +@@ -857,6 +857,7 @@ endif(Q_WS_MAC) + ########### install files ############### + + install(FILES amarok.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) ++install(FILES amarokNoAudio.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) + install(FILES amarok_plugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) + install(FILES amarok_codecinstall.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) + install(FILES amarok_append.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de