[rpms/amarok] epel10.2: - version 1.3.4

[rpms/amarok] epel10.2: - version 1.3.4

[Aurelien Bompard]

            A new commit has been pushed.

            Repo   : rpms/amarok
            Branch : epel10.2
            Commit : 6b92b8aec7827cbbdb32cab82a6b9d1236091971
            Author : Aurelien Bompard <abompard@fedoraproject.org>
            Date   : 2005-10-24T10:54:54+00:00
            Stats  : +41/-59 in 7 file(s)
            URL    : https://src.fedoraproject.org/rpms/amarok/c/6b92b8aec7827cbbdb32cab82a6b9d1236091971?branch=epel10.2

            Log:
            - version 1.3.4
- add mysql and postgresql support
- update desktop database
- add %%doc files

---
diff --git a/.cvsignore b/.cvsignore
index 849fae0..6ce38da 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-1.3.3.tar.bz2
+amarok-1.3.4.tar.bz2

diff --git a/amarok-1.2.4-gcc4bl.patch b/amarok-1.2.4-gcc4bl.patch
deleted file mode 100644
index 323ee7b..0000000
--- a/amarok-1.2.4-gcc4bl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- amarok-1.2.4/configure.gcc4bl	2005-05-19 19:02:45.000000000 +0200
-+++ amarok-1.2.4/configure	2005-05-29 08:44:18.000000000 +0200
-@@ -4120,7 +4120,7 @@
- 
- #ifdef __GNUC__
- #if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
--choke me
-+//choke me
- #endif
- #endif
- 

diff --git a/amarok-1.3-endian.patch b/amarok-1.3-endian.patch
deleted file mode 100644
index 1ae8b67..0000000
--- a/amarok-1.3-endian.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./amarok/src/engine/helix/helix-sp/helixdefines.h.endian	2005-08-22 18:39:21.000000000 +0200
-+++ ./amarok/src/engine/helix/helix-sp/helixdefines.h	2005-08-22 18:39:37.000000000 +0200
-@@ -67,9 +67,9 @@
- #ifndef _LINUX
- #define _LINUX 1
- #endif
--#ifndef _LITTLE_ENDIAN
--#define _LITTLE_ENDIAN 1
--#endif
-+//#ifndef _LITTLE_ENDIAN
-+//#define _LITTLE_ENDIAN 1
-+//#endif
- #ifndef _RED_HAT_5_X_
- #define _RED_HAT_5_X_ 1
- #endif

diff --git a/amarok-1.3-engines-cfg.patch b/amarok-1.3-engines-cfg.patch
index 345f85c..c79baf9 100644
--- a/amarok-1.3-engines-cfg.patch
+++ b/amarok-1.3-engines-cfg.patch
@@ -10,26 +10,3 @@ diff -Nur amarok-1.3-orig/amarok/src/engine/gst/config/gstconfig.kcfg amarok-1.3
          </entry>
          <entry key="Use Custom Sound Device" type="Bool">
              <label>Do not use the autodetected audiosink sound device</label>
-diff -Nur amarok-1.3-orig/amarok/src/engine/helix/config/helixconfig.kcfg amarok-1.3/amarok/src/engine/helix/config/helixconfig.kcfg
---- amarok-1.3-orig/amarok/src/engine/helix/config/helixconfig.kcfg 2005-08-14 17:53:18.000000000 -0500
-+++ amarok-1.3/amarok/src/engine/helix/config/helixconfig.kcfg  2005-08-16 12:14:47.000000000 -0500
-@@ -10,17 +10,17 @@
-         <entry key="Core Directory" type="String">
-             <label>Helix/Realplay core directory</label>
-             <whatsthis>This is the directory where clntcore.so is located</whatsthis>
--            <default>/usr/local/RealPlayer/common</default>
-+            <default>/usr/lib/helix/common</default>
-         </entry>
-         <entry key="Plugin Directory" type="String">
-             <label>Helix/Realplay plugins directory</label>
-             <whatsthis>This is the directory where, for example, vorbisrend.so is located</whatsthis>
--            <default>/usr/local/RealPlayer/plugins</default>
-+            <default>/usr/lib/helix/plugins</default>
-         </entry>
-         <entry key="Codecs Directory" type="String">
-             <label>Helix/Realplay codecs directory</label>
-             <whatsthis>This is the directory where, for example, cvt1.so is located</whatsthis>
--            <default>/usr/local/RealPlayer/codecs</default>
-+            <default>/usr/lib/helix/codecs</default>
-         </entry>
-     </group>

diff --git a/amarok-1.3.4-helix-libs.patch b/amarok-1.3.4-helix-libs.patch
new file mode 100644
index 0000000..6e329f5
--- /dev/null
+++ b/amarok-1.3.4-helix-libs.patch
@@ -0,0 +1,15 @@
+--- ./configure.helix-libs	2005-10-24 00:09:21.000000000 +0200
++++ ./configure	2005-10-24 10:00:13.000000000 +0200
+@@ -33598,7 +33598,11 @@
+             build_helix=$HELIX_LIBS
+         fi
+     elif test "$HXPLAY" != "" -a -x "$HXPLAY"; then
+-        HELIX_LIBS=`dirname $(readlink $HXPLAY)`
++        if test -h "$HXPLAY"; then
++            HELIX_LIBS=`dirname $(readlink $HXPLAY)`
++        else
++            HELIX_LIBS=$withval
++        fi
+         if test -e "$HELIX_LIBS/common/clntcore.so"; then
+             echo "found HelixPlayer"
+             build_helix=$HELIX_LIBS

diff --git a/amarok.spec b/amarok.spec
index 5c07f03..4450ece 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -6,14 +6,14 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3.3
+Version:    1.3.4
 Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.3.tar.bz2
-Patch0:     amarok-1.2.4-gcc4bl.patch
+Source0:    http://dl.sf.net/amarok/amarok-1.3.4.tar.bz2
+Patch0:     amarok-1.3.4-helix-libs.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +25,7 @@ BuildRequires:  gstreamer-plugins-devel >= 0.8.4
 BuildRequires:  libmusicbrainz-devel, xmms-devel >= 1:1.2
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
 BuildRequires:  libtool-ltdl-devel
+BuildRequires:  mysql-devel, postgresql-devel
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif
@@ -35,6 +36,8 @@ BuildRequires:  libmad-devel
 %endif
 
 Requires:   kdemultimedia >= 6:3.2
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
 
@@ -78,8 +81,9 @@ enables it
 
 %prep
 %setup -q
-# remove test for GCC blacklisting
-%patch0 -p1 -b .gcc4bl
+# Discover the helix libs
+%patch0 -p1 -b .helix-libs
+# Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 
 
@@ -89,10 +93,13 @@ unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure \
      --disable-debug \
+     --disable-rpath \
+     --with-helix=%{_libdir}/helix \
+     --enable-mysql \
+     --enable-postgresql \
 %if %{?use_xine:0}%{!?use_xine:1}
      --without-xine
 %endif
-#     --disable-rpath \
 #     --enable-final \
 #     --with-nmm \
 #     --with-mas
@@ -138,6 +145,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
     # and the RPM did not update the cache on uninstall
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
+update-desktop-database &> /dev/null ||:
 
 %postun
 /sbin/ldconfig
@@ -145,6 +153,7 @@ fi
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 fi
+update-desktop-database &> /dev/null ||:
 
 
 %clean
@@ -153,10 +162,11 @@ rm -fr $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
+%doc COPYING AUTHORS ChangeLog README TODO
 %{_bindir}/amarok
 %{_bindir}/amarokapp
-%_datadir/apps/%{name}
-%_datadir/icons/*/*/*
+%{_datadir}/apps/%{name}
+%{_datadir}/icons/*/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/services/amarok_gstengine_plugin.desktop
 %{_datadir}/services/amarok_void-engine_plugin.desktop
@@ -201,6 +211,12 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 24 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.4-1
+- version 1.3.4
+- add mysql and postgresql support
+- update desktop database
+- add %%doc files
+
 * Thu Oct 13 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.3-1
 - version 1.3.3
 - drop endian patch

diff --git a/sources b/sources
index 28d660b..31bfe9d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13f02c3cce06d9c1d0511171d736efa3  amarok-1.3.3.tar.bz2
+c57e20ef687e7f94dd8492e4c6b356c6  amarok-1.3.4.tar.bz2