[rpms/amarok] epel10: - update to version 1.3

[rpms/amarok] epel10: - update to version 1.3

[Aurelien Bompard]

            A new commit has been pushed.

            Repo   : rpms/amarok
            Branch : epel10
            Commit : d8a52029391b32b933bbecb07896598334c926e8
            Author : Aurelien Bompard <abompard@fedoraproject.org>
            Date   : 2005-08-22T13:35:52+00:00
            Stats  : +95/-27 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/amarok/c/d8a52029391b32b933bbecb07896598334c926e8?branch=epel10

            Log:
            - update to version 1.3
- add Michel Salim's improvements:
- call gtk-update-icon-cache to (de-)register icons
- new output plugin subpackage: helix
- patched gst and helix plugins' default settings

---
diff --git a/.cvsignore b/.cvsignore
index 011c023..4afb5c2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-1.2.4.tar.bz2
+amarok-1.3.tar.bz2

diff --git a/amarok-1.3-engines-cfg.patch b/amarok-1.3-engines-cfg.patch
new file mode 100644
index 0000000..ed95297
--- /dev/null
+++ b/amarok-1.3-engines-cfg.patch
@@ -0,0 +1,35 @@
+diff -Nur amarok-1.3-orig/amarok/src/engine/gst/config/gstconfig.kcfg amarok-1.3/amarok/src/engine/gst/config/gstconfig.kcfg
+--- amarok-1.3-orig/amarok/src/engine/gst/config/gstconfig.kcfg 2005-08-14 17:53:18.000000000 -0500
++++ amarok-1.3/amarok/src/engine/gst/config/gstconfig.kcfg  2005-08-16 12:15:31.000000000 -0500
+@@ -10,7 +10,7 @@
+         <entry key="Sound Output" type="String">
+             <label>Sound output method to use</label>
+             <whatsthis>Select the sound output plugin ("sink"). Their availability depends on the system configuration.</whatsthis>
+-            <default>osssink</default>
++            <default>alsasink</default>
+         </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.spec b/amarok.spec
index f5ca99e..160e2de 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -6,15 +6,16 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.2.4
-Release:    6%{?dist}
+Version:    1.3
+Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.2.4.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.3.tar.bz2
 Patch0:     amarok-1.2.4-gcc4bl.patch
-Patch1:     amarok-1.2.4-forward-decl.patch
+#Patch1:     amarok-1.2.4-forward-decl.patch
+Patch2:     amarok-1.3-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -29,6 +30,7 @@ BuildRequires:  libtool-ltdl-devel
 #%else
 #BuildRequires:  libtool
 #%endif
+BuildRequires:  HelixPlayer
 
 %if  0%{?use_xine}
 BuildRequires:  xine-lib-devel >= 0:1.0.0
@@ -57,16 +59,6 @@ Right now, only xmms is supported, which means that you can
 use any of xmms' visualisation plugins with Amarok.
 
 
-%package arts
-Summary:    Arts engine for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}
-
-%description arts
-Amarok can also use the arts engine to decode sound. This package
-enables it.
-
-
 %if "%fedora" >= "4"
 %package akode
 Summary:    AKode engine for Amarok
@@ -78,6 +70,19 @@ Amarok can also use the akode engine to decode sound. This package
 enables it.
 %endif
 
+
+%package helix
+Summary:    Helix engine for Amarok
+Group:      Applications/Multimedia
+Requires:   %{name} = %{version}
+
+%description helix
+Amarok can also use the helix engine to decode sound. This package
+enables it.
+To use the helix engine, you'll have to install either HelixPlayer
+or RealPlayer
+
+
 %if 0%{?use_xine}
 %package xine
 Summary:    Xine engine for Amarok
@@ -94,7 +99,8 @@ enables it
 %setup -q
 # remove test for GCC blacklisting
 %patch0 -p1 -b .gcc4bl
-%patch1 -p1 -b .forward-decl
+#%patch1 -p1 -b .forward-decl
+%patch2 -p1 -b .engines-cfg
 
 
 %build
@@ -103,6 +109,7 @@ unset QTDIR && . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure \
      --disable-debug \
+     --with-helix    \
 %if %{?use_xine:0}%{!?use_xine:1}
      --without-xine
 %endif
@@ -143,8 +150,22 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.desktop
 %find_lang %{name}
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+# update icon themes if necessary
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg
+    # needed because amarok 1.2 puts icon in hicolor
+    # and the RPM did not update the cache on uninstall
+    /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+
+%postun
+/sbin/ldconfig
+# update icon themes if necessary
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg
+fi
 
 
 %clean
@@ -167,12 +188,15 @@ rm -fr $RPM_BUILD_ROOT
 %{_libdir}/kde3/konqsidebar_universalamarok.*
 %{_datadir}/apps/konqsidebartng/*/amarok.desktop
 %{_datadir}/apps/profiles/amarok.profile.xml
-
 %{_libdir}/mcop/Amarok
 %{_libdir}/mcop/amarok*
 %{_datadir}/config/amarokrc
 %{_datadir}/config.kcfg/*.kcfg
 %{_datadir}/doc/HTML/*/amarok
+%{_libdir}/libamarokarts*
+%{_libdir}/kde3/libamarok_artsengine_plugin.*
+%{_datadir}/services/amarok_artsengine_plugin.desktop
+%exclude %{_datadir}/apps/zeroconf/_shoutcast._tcp
 
 
 %files visualisation
@@ -181,13 +205,6 @@ rm -fr $RPM_BUILD_ROOT
 %{_bindir}/amarok_xmmswrapper2
 
 
-%files arts
-%defattr(-,root,root)
-%{_libdir}/libamarokarts*
-%{_libdir}/kde3/libamarok_artsengine_plugin.*
-%{_datadir}/services/amarok_artsengine_plugin.desktop
-
-
 %if "%fedora" >= "4"
 %files akode
 %defattr(-,root,root)
@@ -196,6 +213,12 @@ rm -fr $RPM_BUILD_ROOT
 %endif
 
 
+%files helix
+%defattr(-,root,root)
+%{_libdir}/kde3/libamarok_helixengine_plugin.*
+%{_datadir}/services/amarok_helixengine_plugin.desktop
+
+
 %if 0%{?use_xine}
 %files xine
 %defattr(-,root,root)
@@ -206,6 +229,16 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3-1
+- update to version 1.3
+- add Michel Salim's improvements:
+  - call gtk-update-icon-cache to (de-)register icons
+  - new output plugin subpackage: helix
+  - patched gst and helix plugins' default settings
+
+* Fri Jul 01 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.4-6
+- remove -arts subpackage, it is useless
+
 * Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-6.fc5
 - remove temporary work-around from 1.2.4-2.fc4
 - add patch to fix several missing forward declarations which let

diff --git a/sources b/sources
index 1d00b59..231663e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a3bb2c043d1db169c6a370aff439e0f  amarok-1.2.4.tar.bz2
+2dd100584795fb20c621fdbc96cbee1e  amarok-1.3.tar.bz2