rpms/amarok/devel amarok-1.3-engines-cfg.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 amarok.spec, 1.16, 1.17 sources, 1.9, 1.10
Aurelien Bompard (abompard)
fedora-extras-commits at redhat.com
Mon Aug 22 13:35:54 UTC 2005
- Previous message (by thread): rpms/amarok/FC-4 amarok-1.3-engines-cfg.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 amarok.spec, 1.20, 1.21 sources, 1.9, 1.10
- Next message (by thread): rpms/libifp/FC-3 .cvsignore, 1.2, 1.3 libifp.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: abompard
Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4890/devel
Modified Files:
.cvsignore amarok.spec sources
Added Files:
amarok-1.3-engines-cfg.patch
Log Message:
- 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
amarok-1.3-engines-cfg.patch:
--- NEW FILE amarok-1.3-engines-cfg.patch ---
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>
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 24 May 2005 10:56:28 -0000 1.9
+++ .cvsignore 22 Aug 2005 13:35:52 -0000 1.10
@@ -1 +1 @@
-amarok-1.2.4.tar.bz2
+amarok-1.3.tar.bz2
Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- amarok.spec 8 Jun 2005 20:12:36 -0000 1.16
+++ amarok.spec 22 Aug 2005 13:35:52 -0000 1.17
@@ -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 @@
#%else
#BuildRequires: libtool
#%endif
+BuildRequires: HelixPlayer
%if 0%{?use_xine}
BuildRequires: xine-lib-devel >= 0:1.0.0
@@ -57,16 +59,6 @@
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 @@
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 @@
%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 @@
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 @@
%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 @@
%{_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 @@
%{_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 @@
%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 @@
%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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 24 May 2005 10:56:29 -0000 1.9
+++ sources 22 Aug 2005 13:35:52 -0000 1.10
@@ -1 +1 @@
-9a3bb2c043d1db169c6a370aff439e0f amarok-1.2.4.tar.bz2
+2dd100584795fb20c621fdbc96cbee1e amarok-1.3.tar.bz2
- Previous message (by thread): rpms/amarok/FC-4 amarok-1.3-engines-cfg.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 amarok.spec, 1.20, 1.21 sources, 1.9, 1.10
- Next message (by thread): rpms/libifp/FC-3 .cvsignore, 1.2, 1.3 libifp.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list