[rpms/amarok] epel10.2: version 1.4.3

[rpms/amarok] epel10.2: version 1.4.3

[Aurelien Bompard]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : ee1b5a7b9743be6d902ca72320611e4168d1e763
Author : Aurelien Bompard <abompard@fedoraproject.org>
Date   : 2006-09-13T13:27:07+00:00
Stats  : +15/-209 in 7 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/ee1b5a7b9743be6d902ca72320611e4168d1e763?branch=epel10.2

Log:
version 1.4.3

---
diff --git a/.cvsignore b/.cvsignore
index cb84c92..3e98061 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-1.4.2.tar.bz2
+amarok-1.4.3.tar.bz2

diff --git a/amarok.spec b/amarok.spec
index 9fe43f0..5531049 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,44 +1,17 @@
-%define gst10 0
-%ifarch ppc64 x86_64 s390 s390x ia64
-%define gst10 1
-%endif
-%{?_with_gst10: %define gst10 1}
-
 # The amarok dev (Ian Monroe) prefers to make amarok excludearched on x86_64
 # than to include the unfinished gstreamer engine (private mail following
 # http://amarok.kde.org/blog/archives/210-And-How-Open-Source-Sucks-Sometimes.html )
-%define gst10 0
-
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.4.2
-Release:    2%{?dist}
+Version:    1.4.3
+Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://mirrors.ibiblio.org/pub/mirrors/kde/stable/amarok/1.4.2/src/amarok-1.4.2.tar.bz2
-# Bring back the gstreamer engine from the beta
-#Source1:    amarok-1.4.1-beta1-gst10-2.tar.bz2
-#Patch1:     amarok-1.4.1-gstreamer.patch
-# Gstreamer default sink should be autoaudiosink
-#Patch2:     amarok-1.4-engines-cfg.patch
-
-# Thoses patches are published by the Amarok devs
-
-# AudioCD playback would stutter and sometimes freeze Amarok. (BR 133015)
-Patch3:     audiocd.diff
-# Fixed bug which prevented Amarok from creating the collection database
-# in rare circumstances using SQLite. (BR 133072)
-Patch4:     collection.diff
-# MTP mediadevice support would not compile against libmtp versions >=
-# 0.0.12. (fixed in SVN revision 576121)
-Patch5:     mtp.diff
-# Collection scanner would only restart a maximum of 2 times instead of
-# 20. (fixed in SVN revision 578922)
-Patch6:     scanner.diff
-
+# http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
+Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/1.4.3/src/amarok-1.4.3.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -59,20 +32,16 @@ BuildRequires:  libifp-devel, libusb-devel
 BuildRequires:  libgpod-devel
 # Creative Nomad Jukebox
 BuildRequires:  libnjb-devel
-# Gstreamer engine
-%if "%{gst10}" == "1"
-BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
-%endif
+## Gstreamer engine
+#BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
 # Helix engine on archs where it is available
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif
 
 Requires:  ruby
-# If GStreamer won't be built, Helix will be the only available engine
-%if "%{gst10}" == "0"
+# Helix is the only available engine
 Requires:  HelixPlayer
-%endif
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -115,24 +84,6 @@ use any of xmms' visualisation plugins with Amarok.
 
 %prep
 %setup -q 
-%if "%{gst10}" == "1"
-#%%setup -q -a 1
-# Bring Gstreamer back and make it a sufficient engine
-# (only engine available if Helix in unavailable)
-mv gst10 amarok/src/engine/
-%patch1 -p1 -b .gstreamer
-%patch2 -p1 -b .engines-cfg
-touch --reference aclocal.m4 amarok/src/engine/gst10/Makefile.in
-touch --reference aclocal.m4 amarok/src/engine/gst10/config/Makefile.in
-touch --reference aclocal.m4 amarok/src/engine/gst10/equalizer/Makefile.in
-%endif
-cd amarok
-%patch3 -p0 -b audiocd
-%patch4 -p0 -b collection
-%patch5 -p0 -b mtp
-%patch6 -p0 -b scanner
-cd ..
-
 
 
 
@@ -266,11 +217,9 @@ rm -fr $RPM_BUILD_ROOT
 # Void engine (noop)
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
-# Gstreamer engine
-%if "%{gst10}" == "1"
-%{_datadir}/services/amarok_gst10engine_plugin.desktop
-%{_libdir}/kde3/libamarok_gst10engine_plugin.*
-%endif
+## Gstreamer engine
+#%{_datadir}/services/amarok_gst10engine_plugin.desktop
+#%{_libdir}/kde3/libamarok_gst10engine_plugin.*
 # Helix engine
 %ifnarch ppc64 x86_64 s390 s390x ia64
 %{_libdir}/kde3/libamarok_helixengine_plugin.*
@@ -288,6 +237,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 13 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.4.3-1
+- update to 1.4.3
+
 * Thu Aug 31 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.4.2-2
 - add amarok patchset 1
 

diff --git a/audiocd.diff b/audiocd.diff
deleted file mode 100644
index 4351582..0000000
--- a/audiocd.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: src/collectiondb.cpp
-===================================================================
---- src/collectiondb.cpp	(Revision 578457)
-+++ src/collectiondb.cpp	(Revision 578458)
-@@ -3463,28 +3463,6 @@
-             bundle->copyFrom( peb );
-             valid = true;
-         }
--        else if( bundle->url().protocol() == "audiocd" || bundle->url().protocol() == "cdda" )
--        {
--            // try to see if the engine has some info about the
--            // item (the intended behaviour should be that if the
--            // item is an AudioCD track, the engine can return
--            // CDDB data for it)
--            Engine::SimpleMetaBundle smb;
--            if ( EngineController::engine()->metaDataForUrl( bundle->url(), smb ) )
--            {
--                valid = true;
--                bundle->setTitle( smb.title );
--                bundle->setArtist( smb.artist );
--                bundle->setAlbum( smb.album );
--                bundle->setComment( smb.comment );
--                bundle->setGenre( smb.genre );
--                bundle->setBitrate( smb.bitrate.toInt() );
--                bundle->setSampleRate( smb.samplerate.toInt() );
--                bundle->setLength( smb.length.toInt() );
--                bundle->setYear( smb.year.toInt() );
--                bundle->setTrack( smb.tracknr.toInt() );
--            }
--        }
-     }
- 
-     return valid;

diff --git a/collection.diff b/collection.diff
deleted file mode 100644
index e514b85..0000000
--- a/collection.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: src/collectiondb.cpp
-===================================================================
---- src/collectiondb.cpp	(Revision 577764)
-+++ src/collectiondb.cpp	(Revision 577765)
-@@ -5761,7 +5761,8 @@
- {
- 
-     QStringList values;
--    int error, rc;
-+    int error;
-+    int rc = 0;
-     const char* tail;
-     sqlite3_stmt* stmt;
-     int busyCnt = 0;
-@@ -5787,6 +5788,7 @@
-             Debug::error() << sqlite3_errmsg( m_db ) << endl;
-             Debug::error() << "on query: " << statement << endl;
-             values = QStringList();
-+            break;
-         }
-         else
-         {
-@@ -5851,7 +5853,8 @@
- 
- int SqliteConnection::insert( const QString& statement, const QString& /* table */ )
- {
--    int error, rc;
-+    int error;
-+    int rc = 0;
-     const char* tail;
-     sqlite3_stmt* stmt;
-     int busyCnt = 0;
-@@ -5876,6 +5879,7 @@
-             Debug::error() << k_funcinfo << " sqlite3_compile error:" << endl;
-             Debug::error() << sqlite3_errmsg( m_db ) << endl;
-             Debug::error() << "on insert: " << statement << endl;
-+            break;
-         }
-         else
-         {

diff --git a/mtp.diff b/mtp.diff
deleted file mode 100644
index 4774e30..0000000
--- a/mtp.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: src/mediadevice/mtp/mtpmediadevice.cpp
-===================================================================
---- src/mediadevice/mtp/mtpmediadevice.cpp	(Revision 576120)
-+++ src/mediadevice/mtp/mtpmediadevice.cpp	(Revision 576121)
-@@ -631,7 +631,11 @@
- 	}
- 
-     QString modelname = QString( LIBMTP_Get_Modelname( m_device ) );
-+#if LIBMTP_FRIENDLY_NAME 
-+    QString ownername = QString( LIBMTP_Get_Friendlyname( m_device ) );
-+#else
-     QString ownername = QString( LIBMTP_Get_Ownername( m_device ) );
-+#endif
-     m_name = modelname;
-     if(! ownername.isEmpty() )
-     {
-Index: src/mediadevice/mtp/Makefile.am
-===================================================================
---- src/mediadevice/mtp/Makefile.am	(Revision 576120)
-+++ src/mediadevice/mtp/Makefile.am	(Revision 576121)
-@@ -9,6 +9,7 @@
-     -I$(top_srcdir)/amarok/src/engine \
-     -I$(top_builddir)/amarok/src/engine \
-     -I$(top_srcdir)/amarok/src/mediadevice \
-+    -DLIBMTP_FRIENDLY_NAME=$(LIBMTP_FRIENDLY_NAME) \
-     $(taglib_includes) \
-     $(all_includes)
- 
-Index: configure.in.in
-===================================================================
---- configure.in.in	(Revision 576120)
-+++ configure.in.in	(Revision 576121)
-@@ -808,16 +808,22 @@
-     [build_libmtp=$withval],
-     [build_libmtp=yes]
- )
--
-     if test "$build_libmtp" != "no"; then
-         if test "$PKGCONFIGFOUND" = "yes" ; then
-+            have_libmtp=no
-+            LIBMTP_FRIENDLY_NAME=0
-+            PKG_CHECK_MODULES(LIBMTP, libmtp >= 0.0.12,
-+            [
-+                LIBMTP_FRIENDLY_NAME=1
-+                have_libmtp=yes
-+            ],
-+            [
-+                PKG_CHECK_MODULES(LIBMTP, libmtp < 0.0.12, have_libmtp=yes, have_libmtp=no)
-+            ])
- 
--        # check for libmtp
--        have_libmtp=no
--
--        PKG_CHECK_MODULES(LIBMTP, libmtp, have_libmtp=yes,have_libmtp=no)
-         if test "x$have_libmtp" != "xno"; then
-             AC_DEFINE(HAVE_LIBMTP, 1, [have libmtp])
-+            AC_SUBST(LIBMTP_FRIENDLY_NAME)
-         fi
-     fi
- fi

diff --git a/scanner.diff b/scanner.diff
deleted file mode 100644
index bd18c7a..0000000
--- a/scanner.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/scancontroller.h
-===================================================================
---- src/scancontroller.h	(Revision 578921)
-+++ src/scancontroller.h	(Revision 578922)
-@@ -99,7 +99,7 @@
-         void customEvent( QCustomEvent* );
- 
-         // Member variables:
--        static const uint MAX_RESTARTS = 2;
-+        static const uint MAX_RESTARTS = 20;
- 
-         KProcIO* m_scanner;
-         QStringList m_folders;

diff --git a/sources b/sources
index 634b322..ac2de91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1e5aac4294eb049021d1e2889c0d214  amarok-1.4.2.tar.bz2
+b0b4f8952ad23705c70815d50fd0af52  amarok-1.4.3.tar.bz2