rpms/amarok/FC-4 amarok-1.3.4-helix-libs.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 amarok-1.3-engines-cfg.patch, 1.2, 1.3 amarok.spec, 1.29, 1.30 sources, 1.13, 1.14 amarok-1.2.4-forward-decl.patch, 1.1, NONE amarok-1.2.4-gcc4bl.patch, 1.1, NONE amarok-1.2.4-workaround-missing-libfam.la.patch, 1.1, NONE amarok-1.3-endian.patch, 1.1, NONE amarok-1.3.1-alsa-gst.patch, 1.1, NONE

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10788/FC-4

Modified Files:
	.cvsignore amarok-1.3-engines-cfg.patch amarok.spec sources 
Added Files:
	amarok-1.3.4-helix-libs.patch 
Removed Files:
	amarok-1.2.4-forward-decl.patch amarok-1.2.4-gcc4bl.patch 
	amarok-1.2.4-workaround-missing-libfam.la.patch 
	amarok-1.3-endian.patch amarok-1.3.1-alsa-gst.patch 
Log Message:
- version 1.3.4
- add mysql and postgresql support
- update desktop database
- add %%doc files


amarok-1.3.4-helix-libs.patch:

--- NEW FILE amarok-1.3.4-helix-libs.patch ---
--- ./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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	14 Oct 2005 22:27:43 -0000	1.13
+++ .cvsignore	24 Oct 2005 10:54:53 -0000	1.14
@@ -1 +1 @@
-amarok-1.3.3.tar.bz2
+amarok-1.3.4.tar.bz2

amarok-1.3-engines-cfg.patch:

Index: amarok-1.3-engines-cfg.patch
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok-1.3-engines-cfg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amarok-1.3-engines-cfg.patch	10 Sep 2005 08:22:34 -0000	1.2
+++ amarok-1.3-engines-cfg.patch	24 Oct 2005 10:54:53 -0000	1.3
@@ -10,26 +10,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>


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- amarok.spec	14 Oct 2005 22:27:43 -0000	1.29
+++ amarok.spec	24 Oct 2005 10:54:53 -0000	1.30
@@ -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:  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 @@
 %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 @@
 
 %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 @@
 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 @@
     # 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 @@
 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 @@
 
 %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 @@
 
 
 %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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	14 Oct 2005 22:27:43 -0000	1.13
+++ sources	24 Oct 2005 10:54:53 -0000	1.14
@@ -1 +1 @@
-13f02c3cce06d9c1d0511171d736efa3  amarok-1.3.3.tar.bz2
+c57e20ef687e7f94dd8492e4c6b356c6  amarok-1.3.4.tar.bz2


--- amarok-1.2.4-forward-decl.patch DELETED ---


--- amarok-1.2.4-gcc4bl.patch DELETED ---


--- amarok-1.2.4-workaround-missing-libfam.la.patch DELETED ---


--- amarok-1.3-endian.patch DELETED ---


--- amarok-1.3.1-alsa-gst.patch DELETED ---