]> git.pld-linux.org Git - packages/amarok.git/commitdiff
This commit was manufactured by cvs2git to create branch 'KDE3_BRANCH'. KDE3_BRANCH
authorcvs2git <feedback@pld-linux.org>
Sat, 9 Sep 2006 10:49:24 +0000 (10:49 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Sprout from master 2006-09-09 10:49:22 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> '- fix problems with autoconf 2.60 which creates configure that runs in POSIX mode'
Delete:
    amarok-helixplayer-morearchs.patch
    amarok-libnjb.patch
    amarok.spec
    kde-common-PLD.patch
    kde-common-gcc4.patch

amarok-helixplayer-morearchs.patch [deleted file]
amarok-libnjb.patch [deleted file]
amarok.spec [deleted file]
kde-common-PLD.patch [deleted file]
kde-common-gcc4.patch [deleted file]

diff --git a/amarok-helixplayer-morearchs.patch b/amarok-helixplayer-morearchs.patch
deleted file mode 100644 (file)
index 8bfdbdc..0000000
+++ /dev/null
@@ -1,230 +0,0 @@
---- amarok/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h.orig     2005-11-03 22:22:27.000000000 +0100
-+++ amarok/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h  2005-11-03 23:14:46.000000000 +0100
-@@ -179,7 +179,7 @@
- #elif defined (__sparc__) && defined (__GNUC__)
- /* Increment by 1 */
--inline void
-+static inline void
- HXAtomicIncUINT32(UINT32* pNum)
- {
-     __asm__ __volatile__(\
-@@ -200,7 +200,7 @@
- }
- /* Decrement by 1 */
--inline void
-+static inline void
- HXAtomicDecUINT32(UINT32* pNum)
- {
-     __asm__ __volatile__(
-@@ -221,7 +221,7 @@
- }
- /* Increment by 1 and return new value */
--inline UINT32
-+static inline UINT32
- HXAtomicIncRetUINT32(UINT32* pNum)
- {
-     volatile UINT32 ulRet;
-@@ -245,7 +245,7 @@
- }
- /* Decrement by 1 and return new value */
--inline UINT32
-+static inline UINT32
- HXAtomicDecRetUINT32(UINT32* pNum)
- {   volatile UINT32 ulRet;
-     __asm__ __volatile__(
-@@ -268,7 +268,7 @@
- }
- /* Add n */
--inline void
-+static inline void
- HXAtomicAddUINT32(UINT32* pNum, UINT32 ulNum)
- {
-     __asm__ __volatile__(
-@@ -290,7 +290,7 @@
- }
- /* Subtract n */
--inline void
-+static inline void
- HXAtomicSubUINT32(UINT32* pNum, UINT32 ulNum)
- {
-     __asm__ __volatile__(
-@@ -312,7 +312,7 @@
- }
- /* Add n and return new value */
--inline UINT32
-+static inline UINT32
- HXAtomicAddRetUINT32(UINT32* pNum, UINT32 ulNum)
- {
-     volatile UINT32 ulRet; \
-@@ -337,7 +337,7 @@
- }
- /* Subtract n and return new value */
--inline UINT32
-+static inline UINT32
- HXAtomicSubRetUINT32(UINT32* pNum, UINT32 ulNum)
- {   volatile UINT32 ulRet;
-     __asm__ __volatile__(
-@@ -360,14 +360,14 @@
-         return ulRet;
- }
--inline void HXAtomicIncINT32(INT32* p)              { HXAtomicIncUINT32((UINT32*)p); }
--inline void HXAtomicDecINT32(INT32* p)              { HXAtomicDecUINT32((UINT32*)p); }
--inline void HXAtomicAddINT32(INT32* p, INT32 n)     { HXAtomicAddUINT32((UINT32*)p, (UINT32)n); }
--inline void HXAtomicSubINT32(INT32* p, INT32 n)     { HXAtomicSubUINT32((UINT32*)p, (UINT32)n); }
--inline INT32 HXAtomicIncRetINT32(INT32* p)          { return HXAtomicIncRetUINT32((UINT32*)p); }
--inline INT32 HXAtomicDecRetINT32(INT32* p)          { return HXAtomicDecRetUINT32((UINT32*)p); }
--inline INT32 HXAtomicAddRetINT32(INT32* p, INT32 n) { return HXAtomicAddRetUINT32((UINT32*)p, (UINT32)n); }
--inline INT32 HXAtomicSubRetINT32(INT32* p, INT32 n) { return HXAtomicSubRetUINT32((UINT32*)p, (UINT32)n); }
-+static inline void HXAtomicIncINT32(INT32* p)              { HXAtomicIncUINT32((UINT32*)p); }
-+static inline void HXAtomicDecINT32(INT32* p)              { HXAtomicDecUINT32((UINT32*)p); }
-+static inline void HXAtomicAddINT32(INT32* p, INT32 n)     { HXAtomicAddUINT32((UINT32*)p, (UINT32)n); }
-+static inline void HXAtomicSubINT32(INT32* p, INT32 n)     { HXAtomicSubUINT32((UINT32*)p, (UINT32)n); }
-+static inline INT32 HXAtomicIncRetINT32(INT32* p)          { return HXAtomicIncRetUINT32((UINT32*)p); }
-+static inline INT32 HXAtomicDecRetINT32(INT32* p)          { return HXAtomicDecRetUINT32((UINT32*)p); }
-+static inline INT32 HXAtomicAddRetINT32(INT32* p, INT32 n) { return HXAtomicAddRetUINT32((UINT32*)p, (UINT32)n); }
-+static inline INT32 HXAtomicSubRetINT32(INT32* p, INT32 n) { return HXAtomicSubRetUINT32((UINT32*)p, (UINT32)n); }
-@@ -547,7 +547,7 @@
- #elif defined(__GNUC__) && !defined(_OPENBSD) && \
-       (__GNUC__>2 || (__GNUC__==2 && __GNUC_MINOR__>=95)) && \
-       ( defined (__i486__) || defined (__i586__) || defined (__i686__) || \
--        defined (__pentium__) || defined (__pentiumpro__))
-+        defined (__pentium__) || defined (__pentiumpro__) || defined (__pentium4__) || defined (__athlon__))
- /* Increment by 1 */
- static __inline__ void
-@@ -855,6 +855,114 @@
-  */
- #elif defined (__alpha)
-+#  ifdef __GNUC__
-+
-+/* Increment by 1 and return new value */
-+static inline INT32
-+HXAtomicIncRetINT32(INT32* pNum)
-+{
-+    asm volatile (
-+        "10:     ldl_l   $1, %0\n"          // Load-lock value into a register
-+        "        addl    $1, 1, $1\n"       // Increment value
-+        "        stl_c   $1, %0\n"          // Save new value into *pNum
-+        "        beq     $1, 10b\n"         // Retry if sequence failed
-+        : "=m" (*pNum) : "m" (*pNum) : "$1");
-+    return *pNum;
-+}
-+
-+/* Decrement by 1 and return new value */
-+static inline INT32
-+HXAtomicDecRetINT32(INT32* pNum)
-+{
-+    asm volatile (
-+        "10:     ldl_l   $1, %0\n"          // Load-lock value into a register
-+        "        subl    $1, 1, $1\n"       // Decrement value
-+        "        stl_c   $1, %0\n"          // Save new value into *pNum
-+        "        beq     $1, 10b\n"         // Retry if sequence failed
-+        : "=m" (*pNum) : "m" (*pNum) : "$1");
-+    return *pNum;
-+}
-+
-+/* Add n and return new value */
-+static inline INT32
-+HXAtomicAddRetINT32(INT32* pNum, INT32 n)
-+{
-+    asm volatile (
-+        "10:     ldl_l   $1, %0\n"          // Load-lock value into a register
-+        "        addl    $1, %1, $1\n"      // Add n to value
-+        "        stl_c   $1, %0\n"          // Save new value into *pNum
-+        "        beq     $1, 10b\n"         // Retry if sequence failed
-+        : "=m" (*pNum) : "r" (n), "m" (*pNum) : "$1");
-+    return *pNum;
-+}
-+
-+/* Subtract n and return new value */
-+static inline INT32
-+HXAtomicSubRetINT32(INT32* pNum, INT32 n)
-+{
-+    asm volatile (
-+        "10:     ldl_l   $1, %0\n"          // Load-lock value into a register
-+        "        subl    $1, %1, $1\n"      // Subtract n from value
-+        "        stl_c   $1, %0\n"          // Save new value into *pNum
-+        "        beq     $1, 10b\n"         // Retry if sequence failed
-+        : "=m" (*pNum) : "r" (n), "m" (*pNum) : "$1");
-+    return *pNum;
-+}
-+
-+/* Increment by 1 and return new value */
-+static inline UINT32
-+HXAtomicIncRetUINT32(UINT32* pNum)
-+{
-+    asm volatile (
-+        "10:     ldl_l   $1, %0\n"          // Load-lock value into a register
-+        "        addl    $1, 1, $1\n"       // Increment value
-+        "        stl_c   $1, %0\n"          // Save new value into *pNum
-+        "        beq     $1, 10b\n"         // Retry if sequence failed
-+        : "=m" (*pNum) : "m" (*pNum) : "$1");
-+    return *pNum;
-+}
-+
-+/* Decrement by 1 and return new value */
-+static inline UINT32
-+HXAtomicDecRetUINT32(UINT32* pNum)
-+{
-+    asm volatile (
-+        "10:     ldl_l   $1, %0\n"          // Load-lock value into a register
-+        "        subl    $1, 1, $1\n"       // Decrement value
-+        "        stl_c   $1, %0\n"          // Save new value into *pNum
-+        "        beq     $1, 10b\n"         // Retry if sequence failed
-+        : "=m" (*pNum) : "m" (*pNum) : "$1");
-+    return *pNum;
-+}
-+
-+/* Add n and return new value */
-+static inline UINT32
-+HXAtomicAddRetUINT32(UINT32* pNum, UINT32 n)
-+{
-+    asm volatile (
-+        "10:     ldl_l   $1, %0\n"          // Load-lock value into a register
-+        "        addl    $1, %1, $1\n"      // Add n to value
-+        "        stl_c   $1, %0\n"          // Save new value into *pNum
-+        "        beq     $1, 10b\n"         // Retry if sequence failed
-+        : "=m" (*pNum) : "r" (n), "m" (*pNum) : "$1");
-+    return *pNum;
-+}
-+
-+/* Subtract n and return new value */
-+static inline UINT32
-+HXAtomicSubRetUINT32(UINT32* pNum, UINT32 n)
-+{
-+    asm volatile (
-+        "10:     ldl_l   $1, %0\n"          // Load-lock value into a register
-+        "        subl    $1, %1, $1\n"      // Subtract n from value
-+        "        stl_c   $1, %0\n"          // Save new value into *pNum
-+        "        beq     $1, 10b\n"         // Retry if sequence failed
-+        : "=m" (*pNum) : "r" (n), "m" (*pNum) : "$1");
-+    return *pNum;
-+}
-+
-+#  else
-+
- #include <c_asm.h>
- /* Increment by 1 and return new value */
-@@ -961,6 +1067,8 @@
-         , pNum, n);
- }
-+#  endif
-+
- #define HXAtomicIncINT32(p)    HXAtomicIncRetINT32((p))
- #define HXAtomicDecINT32(p)    HXAtomicDecRetINT32((p))
- #define HXAtomicAddINT32(p,n)  HXAtomicAddRetINT32((p),(n))
diff --git a/amarok-libnjb.patch b/amarok-libnjb.patch
deleted file mode 100644 (file)
index 5643e5d..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur amarok-1.4.1-beta1/amarok/src/mediadevice/njb/njbmediadevice.h amarok-1.4.1-beta1.new/amarok/src/mediadevice/njb/njbmediadevice.h
---- amarok-1.4.1-beta1/amarok/src/mediadevice/njb/njbmediadevice.h     2006-06-18 20:56:09.000000000 +0000
-+++ amarok-1.4.1-beta1.new/amarok/src/mediadevice/njb/njbmediadevice.h 2006-06-20 10:08:31.000000000 +0000
-@@ -17,7 +17,7 @@
- // #include <mediadevice.h>
- #include <mediabrowser.h>
- #include <transferdialog.h>
--#include <libnjb.h>
-+#include <libnjb/libnjb.h>
- #include <qptrlist.h>
- #include <qlistview.h>
-diff -ur amarok-1.4.1-beta1/amarok/src/mediadevice/njb/playlist.h amarok-1.4.1-beta1.new/amarok/src/mediadevice/njb/playlist.h
---- amarok-1.4.1-beta1/amarok/src/mediadevice/njb/playlist.h   2006-06-18 20:56:09.000000000 +0000
-+++ amarok-1.4.1-beta1.new/amarok/src/mediadevice/njb/playlist.h       2006-06-20 10:28:27.000000000 +0000
-@@ -20,7 +20,7 @@
- #define __playlist_h__
- // libnjb
--#include <libnjb.h>
-+#include <libnjb/libnjb.h>
- // Qt
- #include <qstringlist.h>
-diff -ur amarok-1.4.1-beta1/amarok/src/mediadevice/njb/track.h amarok-1.4.1-beta1.new/amarok/src/mediadevice/njb/track.h
---- amarok-1.4.1-beta1/amarok/src/mediadevice/njb/track.h      2006-06-18 20:56:09.000000000 +0000
-+++ amarok-1.4.1-beta1.new/amarok/src/mediadevice/njb/track.h  2006-06-20 10:28:44.000000000 +0000
-@@ -24,7 +24,7 @@
- #include <qstring.h>
- // libnjb
--#include <libnjb.h>
-+#include <libnjb/libnjb.h>
- #include "metabundle.h"
diff --git a/amarok.spec b/amarok.spec
deleted file mode 100644 (file)
index 64cc864..0000000
+++ /dev/null
@@ -1,468 +0,0 @@
-# TODO:
-# - postgresql support alongside mysql
-# - NMM audio backend support (fix build - propably some BRs)
-# - make descriptions less useless
-# - track http://websvn.kde.org/trunk/extragear/multimedia/amarok/TODO?rev=470324&r1=470292&r2=470324
-# - include /usr/bin/amarok_proxy.rb (proxy server for last.fm, but req. ruby)
-# - main package pulls /usr/bin/ruby
-#
-# Conditional builds:
-%bcond_with    gstreamer       # enable gstreamer (gst10 not stable)
-%bcond_without mas             # disable MAS audio backend
-%bcond_without xine            # disable xine engine
-%bcond_without xmms            # disable xmms wrapping
-%bcond_without zeroconf        # disable support for zeroconf
-%bcond_without included_sqlite # don't use included sqlite (VERY BAD IDEA), needs sqlite >= 3.3 otherwise
-%bcond_without helix           # disable HelixPlayer engine
-%bcond_without mp3players      # disable iPod and iRiver MP3 players support
-%bcond_with    nmm             # enable NMM audio backend
-%bcond_with    mysql           # enable MySQL support
-%bcond_with    pgsql           # enable PostgreSQL support
-#
-%ifarch i386
-%undefine      with_helix
-%endif
-
-Summary:       A KDE audio player
-Summary(pl):   Odtwarzacz audio dla KDE
-Name:          amarok
-Version:       1.4.3
-Release:       1
-License:       GPL
-Group:         X11/Applications/Multimedia
-#Source0:      http://dl.sourceforge.net/amarok/%{name}-%{version}.tar.bz2
-Source0:       http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: b0b4f8952ad23705c70815d50fd0af52
-Patch0:                %{name}-helixplayer-morearchs.patch
-Patch1:                %{name}-libnjb.patch
-URL:           http://amarok.kde.org/
-BuildRequires: SDL-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: dbus-glib-devel
-BuildRequires: gettext-devel
-%{?with_gstreamer:BuildRequires:       gstreamer-devel >= 0.10.0}
-BuildRequires: kdebase-devel
-%{?with_akode:BuildRequires:   kdemultimedia-akode}
-BuildRequires: kdemultimedia-devel >= 9:3.1.93
-%{?with_mp3players:BuildRequires:      libgpod-devel >= 0.2.0}
-%{?with_mp3players:BuildRequires:      libifp-devel}
-%{?with_mp3players:BuildRequires:       libmtp-devel}
-%{?with_mp3players:BuildRequires:       libnjb-devel}
-BuildRequires: libltdl-devel
-%{?with_pgsql:BuildRequires:           libpqxx-devel}
-BuildRequires: libtunepimp-devel >= 0.4.0
-BuildRequires: libvisual-devel >= 0.4.0
-BuildRequires: mpeg4ip-devel
-%{?with_mysql:BuildRequires:           mysql-devel}
-BuildRequires: pcre-devel
-BuildRequires: pkgconfig
-BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.129
-BuildRequires: ruby-devel >= 1.8
-BuildRequires: sed >= 4.0
-%{!?with_included_sqlite:BuildRequires:        sqlite3-devel >= 3.3}
-BuildRequires: taglib-devel >= 1.4
-%{?with_xine:BuildRequires:    xine-lib-devel >= 1.1.1}
-%{?with_xmms:BuildRequires:    xmms-devel}
-Requires(post):        /sbin/ldconfig
-Requires:      %{name}-plugin = %{version}-%{release}
-Requires:      kdebase-core >= 9:3.1.93
-Requires:      kdemultimedia-audiocd >= 9:3.1.93
-Obsoletes:     amarok-arts
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%description
-A KDE audio player.
-
-%description -l pl
-Odtwarzacz audio dla KDE.
-
-%package akode
-Summary:       Plugin akode
-Summary(pl):   Wtyczka akode
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{version}-%{release}
-Provides:      %{name}-plugin = %{version}-%{release}
-
-%description akode
-Plugin akode.
-
-%description akode -l pl
-Wtyczka akode.
-
-%package helix
-Summary:       Helix/Realplayer playback support for amarok
-Summary(pl):   Wsparcie dla odtwarzania przez Helix/Realplayera dla amaroka
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{version}-%{release}
-Requires:      helix-core
-Provides:      %{name}-plugin = %{version}-%{release}
-
-%description helix
-Helix/Realplayer playback support for amarok.
-
-%description helix -l pl
-Wsparcie dla odtwarzania przez Helix/Realplayera dla amaroka.
-
-%package gstreamer
-Summary:       Plugin gstreamer
-Summary(pl):   Wtyczka gstreamer
-Group:         X11/Applications/Multimedia
-# deps, to get it working:
-# mp3 decoder: gstreamer-mad
-# ogg decoder: gstreamer-vorbis
-# audio output driver: gstreamer-audiosink-alsa
-# from gstreamer-audio-effects to control volume, etc
-# needed libs:
-#  at least /usr/lib/gstreamer-0.8/libgstresample.so
-#  probably /usr/lib/gstreamer-0.8/libgstadder.so
-#  and probably /usr/lib/gstreamer-0.8/libgstvolume.so
-# gstreamer-musicbrainz for being able to edit id3 tags on files.
-Requires:      %{name} = %{version}-%{release}
-Requires:      gstreamer-audio-effects
-Requires:      gstreamer-audiosink
-Requires:      gstreamer-mad
-Requires:      gstreamer-musicbrainz
-Requires:      gstreamer-vorbis
-Provides:      %{name}-plugin = %{version}-%{release}
-
-%description gstreamer
-Plugin gstreamer.
-
-%description gstreamer -l pl
-Wtyczka gstreamer.
-
-%package xine
-Summary:       Plugin xine
-Summary(pl):   Wtyczka xine
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{version}-%{release}
-Requires:      xine-plugin-audio
-Provides:      %{name}-plugin = %{version}-%{release}
-
-%description xine
-Plugin xine.
-
-%description xine -l pl
-Wtyczka xine.
-
-%package xmms
-Summary:       Xmms wrapper
-Summary(pl):   Wrapper xmms
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{version}-%{release}
-
-%description xmms
-Xmms wrapper.
-
-%description xmms -l pl
-Wrapper xmms.
-
-%package zeroconf
-Summary:       Zeroconf data
-Summary(pl):   Dane dla zeroconf
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{version}-%{release}
-Requires:      kdenetwork-kdnssd
-Provides:      %{name}-plugin = %{version}-%{release}
-
-%description zeroconf
-Zeroconf data.
-
-%description zeroconf -l pl
-Dane dla zeroconf.
-
-%package scripts
-Summary:       amaroK scripts
-Summary(pl):   Skrypty amaroKa
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{version}-%{release}
-Requires:      kdebase-kdialog
-Requires:      python-PyQt
-Requires:      ruby-modules
-
-%description scripts
-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
-Skrypty amaroKa pozwalaj±ce rozszerzaæ jego funkcjonalno¶æ.
-
-Wiêcej o skryptach w amaroKu mo¿na dowiedzieæ siê st±d:
-<http://amarok.kde.org/amarokwiki/index.php/Script-Writing_HowTo>.
-
-%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \
-       amarok/src/amarok.desktop \
-
-# see kde bug #110909
-%{__sed} -i -e 's/amarok_live//' amarok/src/scripts/Makefile.am
-
-# kill env, call interpreter directly, so rpm automatics could rule
-%{__sed} -i -e '
-       1s,#!.*bin/env.*ruby,#!%{_bindir}/ruby,
-       1s,#!.*bin/env.*python,#!%{_bindir}/python,
-       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
-%{__make} -f admin/Makefile.common cvs
-
-# hack: passing something other than "no" or "yes" to --with-helix allows
-# us to pass HELIX_LIBS
-%configure \
-       HELIX_LIBS=%{_libdir}/helixplayer \
-       --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
-       --disable-rpath \
-       --with%{!?with_mas:out}-mas \
-       --with%{!?with_xine:out}-xine \
-       --with%{!?with_gstreamer:out}-gstreamer10 \
-       --with%{!?with_akode:out}-akode \
-       --with%{!?with_helix:out}-helix%{?with_helix:=usegivenpath} \
-       --with%{!?with_nmm:out}-nmm \
-       --with%{!?with_xmms:out}-xmms \
-       --with%{!?with_mp3players:out}-libgpod \
-       --with%{!?with_mp3players:out}-libnjb \
-       --with%{!?with_mp3players:out}-libmtp \
-       --with%{!?with_mp3players:out}-ifp \
-       --%{?with_mysql:en}%{!?with_mysql:dis}able-mysql \
-       --%{?with_mysql:en}%{!?with_mysql:dis}able-postgresql \
-       --disable-final \
-       --with-mp4v2 \
-       --with-qt-libraries=%{_libdir} \
-       --with%{!?with_included_sqlite:out}-included-sqlite
-
-%{__make}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       kde_htmldir=%{_kdedocdir} \
-       kde_libs_htmldir=%{_kdedocdir}
-
-# remove bogus dir
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/xx
-
-%find_lang amarok --all-name --with-kde
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%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
-
-%files -f %{name}.lang
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
-%attr(755,root,root) %{_bindir}/amarok
-%attr(755,root,root) %{_bindir}/amarokapp
-%attr(755,root,root) %{_bindir}/amarokcollectionscanner
-%attr(755,root,root) %{_bindir}/amarok_libvisual
-%attr(755,root,root) %{_bindir}/amarok_proxy.rb
-%attr(755,root,root) %{_bindir}/amarok_daapserver.rb
-%attr(755,root,root) %{_libdir}/libamarok.so.*.*.*
-%{_libdir}/kde3/konqsidebar_universalamarok.la
-%attr(755,root,root) %{_libdir}/kde3/konqsidebar_universalamarok.so
-%{_libdir}/kde3/libamarok_generic-mediadevice.la
-%attr(755,root,root) %{_libdir}/kde3/libamarok_generic-mediadevice.so
-%{_libdir}/kde3/libamarok_void-engine_plugin.la
-%attr(755,root,root) %{_libdir}/kde3/libamarok_void-engine_plugin.so
-%{_libdir}/libamarok.la
-%{_libdir}/kde3/libamarok_daap-mediadevice.la
-%attr(755,root,root) %{_libdir}/kde3/libamarok_daap-mediadevice.so
-%{_libdir}/kde3/libamarok_massstorage-device.la
-%attr(755,root,root) %{_libdir}/kde3/libamarok_massstorage-device.so
-%{_libdir}/kde3/libamarok_nfs-device.la
-%attr(755,root,root) %{_libdir}/kde3/libamarok_nfs-device.so
-%{_libdir}/kde3/libamarok_smb-device.la
-%attr(755,root,root) %{_libdir}/kde3/libamarok_smb-device.so
-%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
-%{_datadir}/apps/amarok/images
-%{_datadir}/apps/amarok/themes
-%{_datadir}/apps/konqueror/servicemenus/amarok_append.desktop
-%{_datadir}/apps/konqsidebartng/add/amarok.desktop
-%{_datadir}/apps/konqsidebartng/entries/amarok.desktop
-%{_datadir}/apps/konqsidebartng/kicker_entries/amarok.desktop
-%{_datadir}/apps/profiles/amarok.profile.xml
-%{_datadir}/config/amarokrc
-%{_datadir}/config.kcfg/amarok.kcfg
-%{_datadir}/services/amarok_generic-mediadevice.desktop
-%{_datadir}/services/amarok_void-engine_plugin.desktop
-%{_datadir}/services/amarok_daap-mediadevice.desktop
-%{_datadir}/services/amarok_massstorage-device.desktop
-%{_datadir}/services/amarok_nfs-device.desktop
-%{_datadir}/services/amarok_smb-device.desktop
-%{_datadir}/services/amaroklastfm.protocol
-%{_datadir}/services/amarokitpc.protocol
-%{_datadir}/services/amarokpcast.protocol
-%{_datadir}/servicetypes/amarok_codecinstall.desktop
-%{_datadir}/servicetypes/amarok_plugin.desktop
-%{_desktopdir}/kde/amarok.desktop
-%{_iconsdir}/*/*/apps/amarok.*
-# TODO: move to subpackage
-%if %{with mp3players}
-%{_libdir}/kde3/libamarok_ifp-mediadevice.la
-%attr(755,root,root) %{_libdir}/kde3/libamarok_ifp-mediadevice.so
-%{_libdir}/kde3/libamarok_ipod-mediadevice.la
-%attr(755,root,root) %{_libdir}/kde3/libamarok_ipod-mediadevice.so
-%{_libdir}/kde3/libamarok_mtp-mediadevice.la
-%attr(755,root,root) %{_libdir}/kde3/libamarok_mtp-mediadevice.so
-%{_libdir}/kde3/libamarok_njb-mediadevice.la
-%attr(755,root,root) %{_libdir}/kde3/libamarok_njb-mediadevice.so
-%{_datadir}/services/amarok_ifp-mediadevice.desktop
-%{_datadir}/services/amarok_ipod-mediadevice.desktop
-%{_datadir}/services/amarok_mtp-mediadevice.desktop
-%{_datadir}/services/amarok_njb-mediadevice.desktop
-%endif
-
-%if %{with akode}
-%files akode
-%defattr(644,root,root,755)
-%{_libdir}/kde3/libamarok_aKode-engine.la
-%attr(755,root,root) %{_libdir}/kde3/libamarok_aKode-engine.so
-%{_datadir}/services/amarok_aKode-engine.desktop
-%endif
-
-%if %{with gstreamer}
-%files gstreamer
-%defattr(644,root,root,755)
-%{_libdir}/kde3/libamarok_gst10engine_plugin.la
-%attr(755,root,root) %{_libdir}/kde3/libamarok_gst10engine_plugin.so
-%{_datadir}/config.kcfg/gstconfig.kcfg
-%{_datadir}/services/amarok_gst10engine_plugin.desktop
-%endif
-
-%if %{with helix}
-%files helix
-%defattr(644,root,root,755)
-%{_libdir}/kde3/libamarok_helixengine_plugin.la
-%attr(755,root,root) %{_libdir}/kde3/libamarok_helixengine_plugin.so
-%{_datadir}/config.kcfg/helixconfig.kcfg
-%{_datadir}/services/amarok_helixengine_plugin.desktop
-%endif
-
-%if %{with xine}
-%files xine
-%defattr(644,root,root,755)
-%{_libdir}/kde3/libamarok_xine-engine.la
-%attr(755,root,root) %{_libdir}/kde3/libamarok_xine-engine.so
-%{_datadir}/config.kcfg/xinecfg.kcfg
-%{_datadir}/services/amarok_xine-engine.desktop
-%endif
-
-%if %{with xmms}
-%files xmms
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/amarok_xmmswrapper2
-%endif
-
-%if 0
-%if %{with zeroconf}
-%files zeroconf
-%defattr(644,root,root,755)
-#%{_datadir}/apps/zeroconf/_shoutcast._tcp
-%endif
-%endif
-
-%files scripts
-%defattr(644,root,root,755)
-%dir %{_datadir}/apps/amarok/scripts/common
-%{_datadir}/apps/amarok/scripts/common/Publisher.py
-%{_datadir}/apps/amarok/scripts/common/Zeroconf.py
-
-%dir %{_datadir}/apps/amarok/scripts/templates
-%{_datadir}/apps/amarok/scripts/templates/amarok.rb
-%{_datadir}/apps/amarok/scripts/templates/python_qt_template.py
-%{_datadir}/apps/amarok/scripts/templates/ruby_qt_template.rb
-
-# amarok searches for executable programs for scripts
-# to figure out which files need to have execute permission, use this
-# find command:
-# $ find $RPM_BUILD_ROOT/usr/share/apps/amarok/scripts -perm +1
-
-#%dir %{_datadir}/apps/amarok/scripts/graphequalizer
-#%{_datadir}/apps/amarok/scripts/graphequalizer/README
-#%attr(755,root,root) %{_datadir}/apps/amarok/scripts/graphequalizer/graphequalizer
-
-%dir %{_datadir}/apps/amarok/scripts/playlist2html
-%{_datadir}/apps/amarok/scripts/playlist2html/README
-%{_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
-
-%dir %{_datadir}/apps/amarok/scripts/webcontrol
-%{_datadir}/apps/amarok/scripts/webcontrol/README
-%{_datadir}/apps/amarok/scripts/webcontrol/Globals.py
-%{_datadir}/apps/amarok/scripts/webcontrol/Playlist.py
-%{_datadir}/apps/amarok/scripts/webcontrol/RequestHandler.py
-%{_datadir}/apps/amarok/scripts/webcontrol/amarok_cut.png
-%{_datadir}/apps/amarok/scripts/webcontrol/controlbackground.png
-%{_datadir}/apps/amarok/scripts/webcontrol/main.css
-%{_datadir}/apps/amarok/scripts/webcontrol/main.js
-%{_datadir}/apps/amarok/scripts/webcontrol/player_end.png
-%{_datadir}/apps/amarok/scripts/webcontrol/player_pause.png
-%{_datadir}/apps/amarok/scripts/webcontrol/player_play.png
-%{_datadir}/apps/amarok/scripts/webcontrol/player_start.png
-%{_datadir}/apps/amarok/scripts/webcontrol/player_stop.png
-%{_datadir}/apps/amarok/scripts/webcontrol/template.thtml
-%{_datadir}/apps/amarok/scripts/webcontrol/vol_speaker.png
-%{_datadir}/apps/amarok/scripts/webcontrol/WebPublisher.py
-%{_datadir}/apps/amarok/scripts/webcontrol/WebControl.spec
-%{_datadir}/apps/amarok/scripts/webcontrol/smallstar.png
-%{_datadir}/apps/amarok/scripts/webcontrol/star.png
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/webcontrol/WebControl.py
-
-%dir %{_datadir}/apps/amarok/scripts/lyrics_astraweb
-%{_datadir}/apps/amarok/scripts/lyrics_astraweb/COPYING
-%{_datadir}/apps/amarok/scripts/lyrics_astraweb/README
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb
-%{_datadir}/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.spec
-
-%dir %{_datadir}/apps/amarok/scripts/lyrics_lyrc
-%{_datadir}/apps/amarok/scripts/lyrics_lyrc/COPYING
-%{_datadir}/apps/amarok/scripts/lyrics_lyrc/README
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.rb
-%{_datadir}/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.spec
-
-%dir %{_datadir}/apps/amarok/scripts/score_default
-%{_datadir}/apps/amarok/scripts/score_default/COPYING
-%{_datadir}/apps/amarok/scripts/score_default/README
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/score_default/score_default.rb
-%{_datadir}/apps/amarok/scripts/score_default/score_default.spec
-%dir %{_datadir}/apps/amarok/scripts/score_impulsive
-%{_datadir}/apps/amarok/scripts/score_impulsive/COPYING
-%{_datadir}/apps/amarok/scripts/score_impulsive/README
-%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
-%{_datadir}/apps/amarok/scripts/amarok_live/amarok.live.remaster.part1.sh
-%{_datadir}/apps/amarok/scripts/amarok_live/amarok.live.remaster.part2.sh
-%attr(755,root,root) %{_datadir}/apps/amarok/scripts/amarok_live/amarok_live.py
-%endif
diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch
deleted file mode 100644 (file)
index 0828582..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -urN kdelibs-3.5.3.or/admin/acinclude.m4.in kdelibs-3.5.3/admin/acinclude.m4.in
---- kdelibs-3.5.3.or/admin/acinclude.m4.in     2006-05-23 13:02:06.000000000 +0000
-+++ kdelibs-3.5.3/admin/acinclude.m4.in        2006-07-01 14:55:49.345359250 +0000
-@@ -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'
-@@ -2977,41 +2977,6 @@
- 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
- ])
-@@ -3153,8 +3118,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
-@@ -4579,9 +4542,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
-@@ -4728,32 +4691,11 @@
- [
-     AC_MSG_CHECKING([for utmp file])
--    AC_CACHE_VAL(kde_cv_utmp_file,
--    [
--    kde_cv_utmp_file=no
-+    AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
--    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
--    ])
--
--    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.)
- ])
-@@ -5536,7 +5478,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)
-
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.093581 seconds and 4 git commands to generate.