]> git.pld-linux.org Git - packages/amarok.git/commitdiff
This commit was manufactured by cvs2git to create tag 'auto-ac-amarok- auto/ac/amarok-1_4_5-5
authorcvs2git <feedback@pld-linux.org>
Sun, 4 May 2008 10:12:14 +0000 (10:12 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
1_4_5-5'.

Sprout from AC-branch 2008-05-04 10:12:14 UTC cvs2git <feedback@pld-linux.org> 'This commit was manufactured by cvs2git to create branch 'AC-branch'.'
Cherrypick from AC-branch 2007-03-18 13:52:36 UTC Elan Ruusamäe <glen@pld-linux.org> '- rel 5 (curl rebuild)':
    amarok.spec -> 1.151.2.10
Delete:
    amarok-libtunepimp-0.4.0.patch
    amarok-lyricsurl.patch
    amarok-mongrel.patch
    kde-common-gcc4.patch

amarok-libtunepimp-0.4.0.patch [deleted file]
amarok-lyricsurl.patch [deleted file]
amarok-mongrel.patch [deleted file]
amarok.spec
kde-common-gcc4.patch [deleted file]

diff --git a/amarok-libtunepimp-0.4.0.patch b/amarok-libtunepimp-0.4.0.patch
deleted file mode 100644 (file)
index dd9fc78..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
---- amarok-1.3.6/amarok/src/ktrm.cpp.orig      2005-11-07 23:19:18.000000000 +0100
-+++ amarok-1.3.6/amarok/src/ktrm.cpp   2005-11-17 12:24:43.006638250 +0100
-@@ -42,7 +42,7 @@
- extern "C"
- {
--    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId);
-+    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus);
- }
- /**
-@@ -66,7 +66,7 @@
-         int id;
-         if(!m_fileMap.contains(lookup->file())) {
--            id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()));
-+            id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()), 1);
-             m_fileMap.insert(lookup->file(), id);
-         }
-         else {
-@@ -121,7 +121,7 @@
-         tp_SetAutoSaveThreshold(m_pimp, -1);
-         tp_SetMoveFiles(m_pimp, false);
-         tp_SetRenameFiles(m_pimp, false);
--        tp_SetUseUTF8(m_pimp, true);
-+        tp_SetID3Encoding(m_pimp, eUTF8);
-         tp_SetNotifyCallback(m_pimp, TRMNotifyCallback, 0);
-         if(KProtocolManager::useProxy()) {
-@@ -245,7 +245,7 @@
-  * Callback fuction for TunePimp lookup events.
-  */
--static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId)
-+static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId, TPFileStatus)
- {
-     if(type != tpFileChanged)
-         return;
-@@ -556,10 +556,10 @@
-                 KTRMResult result;
-                 result.d->title = QString::fromUtf8(tracks[i]->name);
--                result.d->artist = QString::fromUtf8(tracks[i]->artist->name);
--                result.d->album = QString::fromUtf8(tracks[i]->album->name);
-+                result.d->artist = QString::fromUtf8(tracks[i]->artist.name);
-+                result.d->album = QString::fromUtf8(tracks[i]->album.name);
-                 result.d->track = tracks[i]->trackNum;
--                result.d->year = tracks[i]->album->releaseYear;
-+                result.d->year = tracks[i]->album.releaseYear;
-                 result.d->relevance =
-                     4 * stringSimilarity(strList,result.d->title) +
-                     2 * stringSimilarity(strList,result.d->artist) +
diff --git a/amarok-lyricsurl.patch b/amarok-lyricsurl.patch
deleted file mode 100644 (file)
index c1619f4..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./amarok/src/contextbrowser.cpp~   2005-08-16 21:04:08.000000000 +0200
-+++ ./amarok/src/contextbrowser.cpp    2005-08-16 21:10:46.000000000 +0200
-@@ -2407,10 +2407,10 @@
-     }
-     if ( !hash.isEmpty() && hash != QString( "reload" ) )
--        m_lyricCurrentUrl = QString( "http://lyrc.com.ar/en/tema1en.php?hash=%1" )
-+        m_lyricCurrentUrl = QString( "http://glen.alkohol.ee/lyrics.php?hash=%1" )
-                   .arg( hash );
-     else
--        m_lyricCurrentUrl = QString( "http://lyrc.com.ar/en/tema1en.php?artist=%1&songname=%2" )
-+        m_lyricCurrentUrl = QString( "http://glen.alkohol.ee/lyrics.php?artist=%1&songname=%2" )
-                 .arg(
-                 KURL::encode_string_no_slash( EngineController::instance()->bundle().artist() ),
-                 KURL::encode_string_no_slash( title ) );
diff --git a/amarok-mongrel.patch b/amarok-mongrel.patch
deleted file mode 100644 (file)
index cd12b31..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
---- amarok-1.4.9.1/amarok/src/mediadevice/daap/daapserver.cpp~ 2008-04-10 23:16:37.000000000 +0300
-+++ amarok-1.4.9.1/amarok/src/mediadevice/daap/daapserver.cpp  2008-05-03 20:38:40.854585305 +0300
-@@ -30,9 +30,6 @@
-     m_server = new KProcIO();
-     m_server->setComm( KProcess::All );
-     *m_server << "amarok_daapserver.rb";
--    *m_server << locate( "data", "amarok/ruby_lib/" );
--    *m_server << locate( "lib", "ruby_lib/" );
--    *m_server << locate( "data", "amarok/scripts/ruby_debug/debug.rb" );
-     if( !m_server->start( KProcIO::NotifyOnExit, true ) ) {
-         error() << "Failed to start amarok_daapserver.rb" << endl;
-         return;
---- amarok-1.4.9.1/amarok/src/mediadevice/daap/Makefile.am     2008-05-03 20:43:00.885572020 +0300
-+++ amarok-1.4.9.1/amarok/src/mediadevice/daap/Makefile.am     2008-05-03 20:47:24.272751916 +0300
-@@ -36,10 +36,10 @@
- bin_SCRIPTS = amarok_daapserver.rb
--SUBDIRS = daapreader mongrel
-+SUBDIRS = daapreader
- amarokrubylibdir = \
--    $(kde_datadir)/amarok/ruby_lib
-+    $(ruby_rubylibdir)/amarok
- amarokrubylib_DATA = \
-     codes.rb
---- amarok-1.4.9.1/amarok/src/mediadevice/daap/amarok_daapserver.rb~   2008-04-10 23:16:37.000000000 +0300
-+++ amarok-1.4.9.1/amarok/src/mediadevice/daap/amarok_daapserver.rb    2008-05-03 20:43:49.504374104 +0300
-@@ -3,15 +3,10 @@
- #A DAAP Server
- # (c) 2006 Ian Monroe <ian@monroe.nu>
- # License: GNU General Public License V2
--$LOAD_PATH.push(ARGV[0])
--puts "here it is: #{ARGV[0]}"
--$LOAD_PATH.push(ARGV[1])
--puts "here it is: #{ARGV[1]}"
--require "codes.rb"
-+require "amarok/codes"
- require 'mongrel'
--require "#{ARGV[2]}" #debug.rb
--
-+require "amarok/debug"
- require 'uri'
- require 'pp'
- #require 'ruby-prof'
---- amarok-1.4.9.1/amarok/src/scripts/ruby_debug/Makefile.am~  2008-04-10 23:16:37.000000000 +0300
-+++ amarok-1.4.9.1/amarok/src/scripts/ruby_debug/Makefile.am   2008-05-03 20:44:52.908028283 +0300
-@@ -1,5 +1,5 @@
- rubydebugdir = \
--    $(kde_datadir)/amarok/scripts/ruby_debug
-+    $(ruby_rubylibdir)/amarok
- rubydebug_DATA = \
-     debug.rb
---- amarok-1.4.9.1/amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb~      2008-05-03 20:49:32.000000000 +0300
-+++ amarok-1.4.9.1/amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb       2008-05-04 13:10:28.364031973 +0300
-@@ -12,7 +12,7 @@
- require "net/http"
- require "rexml/document"
--# require File.dirname( File.expand_path( __FILE__ ) ) + "/../ruby_debug/debug.rb"
-+# require "amarok/debug"
- require "uri"
- @app_name = "Lyrics_Lyrc"
index e8c47614b8c89b9ab3655a143165ba2e9552a3eb..87f31e08ba3b164d7512c587ef4f2212dfea773f 100644 (file)
@@ -6,8 +6,8 @@
 # - include /usr/bin/amarok_proxy.rb (proxy server for last.fm, but req. ruby)
 # - main package pulls /usr/bin/ruby
 # - monitor http://bugs.kde.org/show_bug.cgi?id=137390 to remove the temporary fix
-# - ProjectM (see README)
 # - karma & MFS (see README)
+# - ProjectM (see README)
 #
 # Conditional builds:
 %bcond_with    gstreamer       # enable gstreamer (gst10 not stable)
 %endif
 
 Summary:       A KDE audio player
-Summary(pl.UTF-8):     Odtwarzacz audio dla KDE
+Summary(pl):   Odtwarzacz audio dla KDE
 Name:          amarok
-Version:       1.4.9.1
-Release:       1
+Version:       1.4.5
+Release:       5
 License:       GPL
 Group:         X11/Applications/Multimedia
 Source0:       ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: aa588778379a391ad3f4b3fc770217e4
+# Source0-md5: 1dac1cb5ac9c9cdabdab5f69b39e92c8
 Patch0:                %{name}-helixplayer-morearchs.patch
 Patch1:                %{name}-libnjb.patch
 Patch2:                %{name}-smp.patch
@@ -42,7 +42,6 @@ Patch4:               kde-ac260-lt.patch
 Patch5:                kde-common-PLD.patch
 Patch6:                %{name}-gcc4.patch
 Patch7:                %{name}-titleorder.patch
-Patch8:                %{name}-mongrel.patch
 URL:           http://amarok.kde.org/
 BuildRequires: SDL-devel
 BuildRequires: alsa-lib-devel
@@ -54,7 +53,7 @@ BuildRequires:        gettext-devel
 BuildRequires: kdebase-devel
 %{?with_akode:BuildRequires:   kdemultimedia-akode}
 BuildRequires: kdemultimedia-devel >= 9:3.1.93
-%{?with_mp3players:BuildRequires:      libgpod-devel >= 0.6.0}
+%{?with_mp3players:BuildRequires:      libgpod-devel >= 0.4.2}
 %{?with_mp3players:BuildRequires:      libifp-devel >= 1.0.0.2}
 BuildRequires: libltdl-devel
 %{?with_mp3players:BuildRequires:      libmtp-devel >= 0.1.1}
@@ -77,30 +76,6 @@ Requires(post):      /sbin/ldconfig
 Requires:      %{name}-plugin = %{version}-%{release}
 Requires:      kdebase-core >= 9:3.1.93
 Requires:      kdemultimedia-audiocd >= 9:3.1.93
-Requires:      ruby-mongrel
-Suggests:      libvisual-plugin-actor-JESS
-Suggests:      libvisual-plugin-actor-bumpscope
-Suggests:      libvisual-plugin-actor-corona
-Suggests:      libvisual-plugin-actor-flower
-Suggests:      libvisual-plugin-actor-gdkpixbuf
-Suggests:      libvisual-plugin-actor-gforce
-Suggests:      libvisual-plugin-actor-gstreamer
-Suggests:      libvisual-plugin-actor-infinite
-Suggests:      libvisual-plugin-actor-jakdaw
-Suggests:      libvisual-plugin-actor-lv_analyzer
-Suggests:      libvisual-plugin-actor-lv_gltest
-Suggests:      libvisual-plugin-actor-lv_scope
-Suggests:      libvisual-plugin-actor-madspin
-Suggests:      libvisual-plugin-actor-nastyfft
-Suggests:      libvisual-plugin-actor-oinksie
-Suggests:      libvisual-plugin-input-alsa
-Suggests:      libvisual-plugin-input-esd
-Suggests:      libvisual-plugin-input-jack
-Suggests:      libvisual-plugin-input-mplayer
-Suggests:      libvisual-plugin-morph-alphablend
-Suggests:      libvisual-plugin-morph-flash
-Suggests:      libvisual-plugin-morph-slide
-Suggests:      libvisual-plugin-morph-tentacle
 Obsoletes:     amarok-arts
 Obsoletes:     amarok-xmms
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -111,12 +86,12 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 A KDE audio player.
 
-%description -l pl.UTF-8
+%description -l pl
 Odtwarzacz audio dla KDE.
 
 %package akode
 Summary:       Plugin akode
-Summary(pl.UTF-8):     Wtyczka akode
+Summary(pl):   Wtyczka akode
 Group:         X11/Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}
 Provides:      %{name}-plugin = %{version}-%{release}
@@ -124,12 +99,12 @@ Provides:  %{name}-plugin = %{version}-%{release}
 %description akode
 Plugin akode.
 
-%description akode -l pl.UTF-8
+%description akode -l pl
 Wtyczka akode.
 
 %package helix
 Summary:       Helix/Realplayer playback support for amarok
-Summary(pl.UTF-8):     Wsparcie dla odtwarzania przez Helix/Realplayera dla amaroka
+Summary(pl):   Wsparcie dla odtwarzania przez Helix/Realplayera dla amaroka
 Group:         X11/Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}
 Requires:      helix-core
@@ -138,12 +113,12 @@ Provides: %{name}-plugin = %{version}-%{release}
 %description helix
 Helix/Realplayer playback support for amarok.
 
-%description helix -l pl.UTF-8
+%description helix -l pl
 Wsparcie dla odtwarzania przez Helix/Realplayera dla amaroka.
 
 %package gstreamer
 Summary:       Plugin gstreamer
-Summary(pl.UTF-8):     Wtyczka gstreamer
+Summary(pl):   Wtyczka gstreamer
 Group:         X11/Applications/Multimedia
 # deps, to get it working:
 # mp3 decoder: gstreamer-mad
@@ -166,12 +141,12 @@ Provides: %{name}-plugin = %{version}-%{release}
 %description gstreamer
 Plugin gstreamer.
 
-%description gstreamer -l pl.UTF-8
+%description gstreamer -l pl
 Wtyczka gstreamer.
 
 %package xine
 Summary:       Plugin xine
-Summary(pl.UTF-8):     Wtyczka xine
+Summary(pl):   Wtyczka xine
 Group:         X11/Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}
 Requires:      xine-plugin-audio
@@ -180,12 +155,12 @@ Provides: %{name}-plugin = %{version}-%{release}
 %description xine
 Plugin xine.
 
-%description xine -l pl.UTF-8
+%description xine -l pl
 Wtyczka xine.
 
 %package zeroconf
 Summary:       Zeroconf data
-Summary(pl.UTF-8):     Dane dla zeroconf
+Summary(pl):   Dane dla zeroconf
 Group:         X11/Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}
 Requires:      kdenetwork-kdnssd
@@ -194,12 +169,12 @@ Provides: %{name}-plugin = %{version}-%{release}
 %description zeroconf
 Zeroconf data.
 
-%description zeroconf -l pl.UTF-8
+%description zeroconf -l pl
 Dane dla zeroconf.
 
 %package scripts
 Summary:       amaroK scripts
-Summary(pl.UTF-8):     Skrypty amaroKa
+Summary(pl):   Skrypty amaroKa
 Group:         X11/Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}
 Requires:      kdebase-kdialog
@@ -212,10 +187,10 @@ amaroK scripts allow you extend amaroK functionality.
 You can learn more about scripts in amaroK from here:
 <http://amarok.kde.org/amarokwiki/index.php/Script-Writing_HowTo>.
 
-%description scripts -l pl.UTF-8
-Skrypty amaroKa pozwalające rozszerzać jego funkcjonalność.
+%description scripts -l pl
+Skrypty amaroKa pozwalaj±ce rozszerzaæ jego funkcjonalno¶æ.
 
-Więcej o skryptach w amaroKu można dowiedzieć się stąd:
+Wiêcej o skryptach w amaroKu mo¿na dowiedzieæ siê st±d:
 <http://amarok.kde.org/amarokwiki/index.php/Script-Writing_HowTo>.
 
 %prep
@@ -228,7 +203,6 @@ Więcej o skryptach w amaroKu można dowiedzieć się stąd:
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \
        amarok/src/amarok.desktop \
@@ -240,7 +214,8 @@ Więcej o skryptach w amaroKu można dowiedzieć się stąd:
 %{__sed} -i -e '
        1s,#!.*bin/env.*ruby,#!%{_bindir}/ruby,
        1s,#!.*bin/env.*python,#!%{__python},
-' amarok/src/scripts/*/*.{py,rb} amarok/src/amarok_proxy.rb
+       1s,#!.*bin/env.*bash,#!/bin/bash,
+' amarok/src/scripts/*/*.{py,rb,sh} amarok/src/amarok_proxy.rb
 
 %build
 cp -f /usr/share/automake/config.sub admin
@@ -276,22 +251,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       ruby_rubylibdir=%{ruby_rubylibdir} \
        kde_htmldir=%{_kdedocdir} \
        kde_libs_htmldir=%{_kdedocdir}
 
 # remove bogus dir
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/xx
 
-rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/libamarok.{so,la}
+rm $RPM_BUILD_ROOT%{_libdir}/ruby_lib/libhttp11.la
 
 %find_lang amarok --all-name --with-kde
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+if [ "$1" = 1 ]; then
+       echo "Remember to install libvisual-plugins-* packages if you"
+       echo "want to have a visualizations in amaroK."
+fi
 
 %postun        -p /sbin/ldconfig
 
@@ -302,21 +280,31 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/amarokapp
 %attr(755,root,root) %{_bindir}/amarokcollectionscanner
 %attr(755,root,root) %{_bindir}/amarok_libvisual
-# used by last.fm and daap
 %attr(755,root,root) %{_bindir}/amarok_proxy.rb
-# used by daap
 %attr(755,root,root) %{_bindir}/amarok_daapserver.rb
+%attr(755,root,root) %{_libdir}/libamarok.so
 %attr(755,root,root) %{_libdir}/libamarok.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libamarok.so.0
+%{_libdir}/libamarok.la
 %attr(755,root,root) %{_libdir}/kde3/konqsidebar_universalamarok.so
+%{_libdir}/kde3/konqsidebar_universalamarok.la
 %attr(755,root,root) %{_libdir}/kde3/libamarok_generic-mediadevice.so
+%{_libdir}/kde3/libamarok_generic-mediadevice.la
 %attr(755,root,root) %{_libdir}/kde3/libamarok_void-engine_plugin.so
+%{_libdir}/kde3/libamarok_void-engine_plugin.la
 %attr(755,root,root) %{_libdir}/kde3/libamarok_daap-mediadevice.so
+%{_libdir}/kde3/libamarok_daap-mediadevice.la
 %attr(755,root,root) %{_libdir}/kde3/libamarok_massstorage-device.so
+%{_libdir}/kde3/libamarok_massstorage-device.la
 %attr(755,root,root) %{_libdir}/kde3/libamarok_nfs-device.so
+%{_libdir}/kde3/libamarok_nfs-device.la
 %attr(755,root,root) %{_libdir}/kde3/libamarok_smb-device.so
+%{_libdir}/kde3/libamarok_smb-device.la
+%{_libdir}/ruby_lib/http11.rb
+%attr(755,root,root) %{_libdir}/ruby_lib/libhttp11.so
+%attr(755,root,root) %{_libdir}/ruby_lib/libhttp11.so.0.0.0
 %dir %{_datadir}/apps/amarok
 %dir %{_datadir}/apps/amarok/scripts
+%{_datadir}/apps/amarok/ruby_lib
 %{_datadir}/apps/amarok/*.rc
 %{_datadir}/apps/amarok/data
 %{_datadir}/apps/amarok/icons
@@ -344,20 +332,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/servicetypes/amarok_plugin.desktop
 %{_desktopdir}/kde/amarok.desktop
 %{_iconsdir}/*/*/apps/amarok.*
-
-# TODO: move to subpackage
-%dir %{ruby_rubylibdir}/amarok
-# used by daap
-%{ruby_rubylibdir}/amarok/codes.rb
-# used by daap and lyrics_lyrc
-%{ruby_rubylibdir}/amarok/debug.rb
-
 # TODO: move to subpackage
 %if %{with mp3players}
 %attr(755,root,root) %{_libdir}/kde3/libamarok_ifp-mediadevice.so
+%{_libdir}/kde3/libamarok_ifp-mediadevice.la
 %attr(755,root,root) %{_libdir}/kde3/libamarok_ipod-mediadevice.so
+%{_libdir}/kde3/libamarok_ipod-mediadevice.la
 %attr(755,root,root) %{_libdir}/kde3/libamarok_mtp-mediadevice.so
+%{_libdir}/kde3/libamarok_mtp-mediadevice.la
 %attr(755,root,root) %{_libdir}/kde3/libamarok_njb-mediadevice.so
+%{_libdir}/kde3/libamarok_njb-mediadevice.la
 %{_datadir}/services/amarok_ifp-mediadevice.desktop
 %{_datadir}/services/amarok_ipod-mediadevice.desktop
 %{_datadir}/services/amarok_mtp-mediadevice.desktop
@@ -383,6 +367,7 @@ rm -rf $RPM_BUILD_ROOT
 %files helix
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde3/libamarok_helixengine_plugin.so
+%{_libdir}/kde3/libamarok_helixengine_plugin.la
 %{_datadir}/config.kcfg/helixconfig.kcfg
 %{_datadir}/services/amarok_helixengine_plugin.desktop
 %endif
@@ -391,6 +376,7 @@ rm -rf $RPM_BUILD_ROOT
 %files xine
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde3/libamarok_xine-engine.so
+%{_libdir}/kde3/libamarok_xine-engine.la
 %{_datadir}/config.kcfg/xinecfg.kcfg
 %{_datadir}/services/amarok_xine-engine.desktop
 %endif
@@ -428,9 +414,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/apps/amarok/scripts/playlist2html/Playlist.py
 %attr(755,root,root) %{_datadir}/apps/amarok/scripts/playlist2html/PlaylistServer.py
 %attr(755,root,root) %{_datadir}/apps/amarok/scripts/playlist2html/playlist2html.py
-%{_datadir}/apps/amarok/scripts/playlist2html/PlaylistServer.spec
-%{_datadir}/apps/amarok/scripts/playlist2html/playlist2html.spec
-
 
 %dir %{_datadir}/apps/amarok/scripts/webcontrol
 %{_datadir}/apps/amarok/scripts/webcontrol/README
@@ -477,6 +460,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_datadir}/apps/amarok/scripts/score_impulsive/score_impulsive.rb
 %{_datadir}/apps/amarok/scripts/score_impulsive/score_impulsive.spec
 
+%dir %{_datadir}/apps/amarok/scripts/ruby_debug
+%{_datadir}/apps/amarok/scripts/ruby_debug/debug.rb
+
 %if 0
 %dir %{_datadir}/apps/amarok/scripts/amarok_live
 %{_datadir}/apps/amarok/scripts/amarok_live/README
diff --git a/kde-common-gcc4.patch b/kde-common-gcc4.patch
deleted file mode 100644 (file)
index 9ccb0ea..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
---- amaroc/admin/acinclude.m4.in.orig  2006-04-03 18:02:49.000000000 +0200
-+++ amaroc/admin/acinclude.m4.in       2006-04-03 18:20:39.000000000 +0200
-@@ -428,7 +428,7 @@
- if test "$1" = "default"; then
-   if test -z "$kde_htmldir"; then
--    kde_htmldir='\${datadir}/doc/HTML'
-+    kde_htmldir='/usr/share/doc/kde/HTML'
-   fi
-   if test -z "$kde_appsdir"; then
-     kde_appsdir='\${datadir}/applnk'
-@@ -2974,48 +2974,6 @@
-   fi
- ])
--
--AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
--[
--  AC_MSG_CHECKING([whether $CC is blacklisted])
--
--  dnl In theory we have tu run this test against $CC and $CXX
--  dnl in C and in C++ mode, because its perfectly legal for
--  dnl the user to mix compiler versions, since C has a defined
--  dnl ABI. 
--  dnl 
--  dnl For now, we assume the user is not on crack.
--
--  AC_TRY_COMPILE([
--#ifdef __GNUC__
--#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
--choke me
--#endif
--#endif
--], ,
--  kde_bad_compiler=no, 
--  kde_bad_compiler=yes
--)
--
--  AC_MSG_RESULT($kde_bad_compiler)
--
--if test "$kde_bad_compiler" = "yes"; then
--  AC_MSG_ERROR([
--
--This particular compiler version is blacklisted because it
--is known to miscompile KDE. Please use a newer version, or
--if that is not yet available, choose an older version. 
--
--Please do not report a bug or bother us reporting this
--configure error. We know about it, and we introduced
--it by intention to avoid untraceable bugs or crashes in KDE.
--
--])
--fi
--
--])
--
--
- AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH],
- [
-   AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline],
-@@ -3153,8 +3111,6 @@
-   AC_PROG_CXX
--  KDE_CHECK_FOR_BAD_COMPILER
--
-   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
-     if test "$kde_use_debug_code" != "no"; then
-       if test "$CXX" = "KCC"; then
-@@ -4576,9 +4532,9 @@
-   LIBPYTHON=-lpython$version
- fi
--AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
-+AC_FIND_FILE(python$version/copy.pyc, "/usr/share" , python_moddir)
- python_moddir=$python_moddir/python$version
--if test ! -r $python_moddir/copy.py; then
-+if test ! -r $python_moddir/copy.pyc; then
-   python_moddir=no
- fi
-@@ -4725,32 +4681,11 @@
- [
-     AC_MSG_CHECKING([for utmp file])
--    AC_CACHE_VAL(kde_cv_utmp_file,
--    [
--    kde_cv_utmp_file=no
--
--    for ac_file in    \
--                      \
--      /var/run/utmp \
--      /var/adm/utmp \
--      /etc/utmp     \
--     ; \
--    do
--     if test -r "$ac_file"; then
--       kde_cv_utmp_file=$ac_file
--       break
--     fi
--    done
--    ])
-+    AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
--    if test "$kde_cv_utmp_file" != "no"; then
--      AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
--      $1
--      AC_MSG_RESULT($kde_cv_utmp_file)
--    else
--      $2
--      AC_MSG_RESULT([non found])
--    fi
-+    AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
-+    $1
-+    AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.)
- ])
-@@ -5533,7 +5468,7 @@
-   kde_qtdir="$with_qt_dir"
- fi
--AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
-+AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR)
- AC_MSG_RESULT($QTDOCDIR)
- AC_SUBST(QTDOCDIR)
This page took 0.055484 seconds and 4 git commands to generate.