rpms/amarok/F-8 amarok-1.4.8-gcc43.patch, NONE, 1.1 amarok.spec, 1.92, 1.93

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Fri Feb 22 04:04:09 UTC 2008 

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24838

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.8-gcc43.patch 
Log Message:
* Thu Feb 21 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.4.8-4
- -konqueror subpkg (#426803)
- fix multiarch conflicts (#340641)
  drop Provides: amarok-devel (f9+), add Obsoletes: amarok-devel
- gcc43 patch (#433904)


amarok-1.4.8-gcc43.patch:

--- NEW FILE amarok-1.4.8-gcc43.patch ---
diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp
--- amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
+++ amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp	2008-02-21 21:05:18.000000000 -0600
@@ -30,6 +30,7 @@ email                : aumuell at reserv.at
 #include <audioproperties.h>
 
 #include <stdint.h>
+#include <stdlib.h>
 
 #define MP4V2_HAS_WRITE_BUG 1
 
diff -up amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp
--- amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
+++ amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp	2008-02-21 21:05:18.000000000 -0600
@@ -24,6 +24,7 @@
 
 #include "taglib_mp4filetyperesolver.h"
 #include "mp4file.h"
+#include <string.h>
 
 TagLib::File *MP4FileTypeResolver::createFile(const char *fileName,
         bool readProperties,
diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp
--- amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
+++ amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp	2008-02-21 21:05:18.000000000 -0600
@@ -24,6 +24,8 @@ email                : andrew.leadbetter
 
 #include <tag.h>
 #include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 
 using namespace TagLib;
 
diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp
--- amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp.gcc43	2007-12-17 09:53:19.000000000 -0600
+++ amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp	2008-02-21 21:05:18.000000000 -0600
@@ -30,6 +30,7 @@ email                : andrew.leadbetter
 #endif
 
 #include <stdint.h>
+#include <string.h>
 
 #ifndef UINT64_TO_DOUBLE
 #define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))
diff -up amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp.gcc43 amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp
--- amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp.gcc43	2007-12-17 09:53:18.000000000 -0600
+++ amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp	2008-02-21 21:07:10.000000000 -0600
@@ -15,6 +15,8 @@
  the alsa guys
  ***************************************************************************/
 
+#include <stdlib.h>
+#include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
diff -up amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h.gcc43 amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h
--- amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h.gcc43	2007-12-17 09:53:18.000000000 -0600
+++ amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h	2008-02-21 21:07:54.000000000 -0600
@@ -23,6 +23,7 @@ class HelixSimplePlayerAudioStreamInfoRe
 #include <limits.h>
 #include <sys/param.h>
 #include <pthread.h>
+#include <string.h>
 #include <vector>
 #include <config.h>
 #include <iostream>
diff -up amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp.gcc43 amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp
--- amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp.gcc43	2007-12-17 09:53:18.000000000 -0600
+++ amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp	2008-02-21 21:09:38.000000000 -0600
@@ -15,6 +15,7 @@
 #include <climits>
 #include <cmath>
 #include <stdarg.h>
+#include <string.h>
 
 #include <config.h>
 


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-8/amarok.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- amarok.spec	21 Dec 2007 17:29:54 -0000	1.92
+++ amarok.spec	22 Feb 2008 04:03:30 -0000	1.93
@@ -3,23 +3,29 @@
 
 %define _with_mp4v2 --with-mp4v2
 
+%if 0%{?fedora} < 9 
+%define konq 1
+%endif
+
+%ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 alpha
+%define _with_helix --with-helix=%{_libdir}/helix
+%endif
+
 Name:       amarok
 Summary:    Media player
 Version:    1.4.8
-Release:    1%{?dist}
+Release:    4%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
 Url:        http://amarok.kde.org
-# http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
-#Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 Source0:    ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1:     amarok-1.4.8-gcc43.patch
 # Use xdg-open to start the selected browser
 Patch2:     amarok-1.4.7-xdg.patch
 
-#BuildRequires:  automake libtool
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  esound-devel
@@ -32,7 +38,10 @@
 %ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 alpha
 BuildRequires:  HelixPlayer
 %endif
+BuildRequires:  kdelibs3-devel
+%if 0%{?konq}
 BuildRequires:  kdebase3-devel
+%endif
 BuildRequires:  taglib-devel 
 BuildRequires:  libifp-devel
 # Ipod
@@ -66,7 +75,20 @@
 Requires:  xdg-utils
 
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
+
+Obsoletes: amarok-devel < %{version}-%{release}
+%if 0%{?fedora} > 6 && 0%{?fedora} < 9
+# need to keep this around for previous releases, so not to break multilib compat.
 Provides:  amarok-devel = %{version}-%{release}
+%endif
+
+# engines, etc...
+# old, obsolete ones: arts, akode
+Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
+# xine-lib
+Provides: %{name}-engine-xine = %{version}-%{release}
+
+
 
 
 %description
@@ -81,14 +103,21 @@
 To use the helix engine, you'll have to install either HelixPlayer
 or RealPlayer
 
+%package konqueror
+Summary: Amarok konqueror (service menus, sidebar) support
+Group:   Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+# Upgrade path for previous users, where this subpkg didn't yet exist -- Rex
+Obsoletes: %{name} < 1.4.8-4
+%description konqueror
+%{summary}.
 
 %package visualisation
 Summary:    Visualisation plugins for Amarok
 Group:      Applications/Multimedia
-Requires:   %{name} = %{version}
+Requires:   %{name} = %{version}-%{release}
 # No plugins by default, we need libvisual-plugins
 Requires:   libvisual-plugins
-
 %description visualisation
 Amarok can use visualisation plugins from different origins.
 Right now, only xmms is supported, which means that you can
@@ -99,6 +128,7 @@
 %prep
 %setup -q 
 
+%patch1 -p1 -b .gcc43
 %patch2 -p1 -b .xdg
 
 
@@ -112,9 +142,7 @@
      --enable-postgresql \
      --with-ifp \
      --with-libgpod \
-%ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 alpha
-     --with-helix=%{_libdir}/helix \
-%endif
+     %{?_with_helix} %{!?_with_helix:--without-helix} \
      %{?_with_gstreamer} \
      %{?_with_mp4v2} %{!?_with_mp4v2:--without-mp4v2}
 
@@ -137,11 +165,11 @@
         --delete-original \
         $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
-#rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.desktop
-# Amarok crashes without the *.la files !
-#find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-# Remove the *.la file in /usr/lib though, those are OK to delete
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+# unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%if ! 0%{?konq}
+rm -f $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/*.desktop
+%endif
 
 
 %find_lang %{name} 
@@ -156,22 +184,22 @@
 
 
 %post
+/sbin/ldconfig
 # update icon themes if necessary
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
-ldconfig
 
 %postun
+/sbin/ldconfig
 # update icon themes if necessary
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 update-desktop-database &> /dev/null ||:
-ldconfig
 
 
 %clean
@@ -185,20 +213,17 @@
 %{_bindir}/amarokapp
 %{_bindir}/amarokcollectionscanner
 %{_bindir}/amarok_proxy.rb
-%{_datadir}/apps/%{name}
+%{_datadir}/apps/amarok/
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/servicetypes/*.desktop
-%{_datadir}/apps/konqueror/servicemenus/*.desktop
-%{_libdir}/kde3/konqsidebar_universalamarok.*
-%{_libdir}/libamarok.*
-%{_datadir}/apps/konqsidebartng/*/amarok.desktop
 %{_datadir}/apps/profiles/amarok.profile.xml
 %{_datadir}/config/amarokrc
 %{_datadir}/config.kcfg/*.kcfg
 %{_datadir}/services/amarokitpc.protocol
 %{_datadir}/services/amaroklastfm.protocol
 %{_datadir}/services/amarokpcast.protocol
+%{_libdir}/libamarok.*
 %{_libdir}/ruby_lib/*
 # DAAP
 %{_bindir}/amarok_daapserver.rb
@@ -241,17 +266,37 @@
 #%{_datadir}/services/amarok_gst10engine_plugin.desktop
 #%{_libdir}/kde3/libamarok_gst10engine_plugin.*
 # Helix engine
-%ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 alpha
+%if 0%{?_with_helix:1}
 %{_libdir}/kde3/libamarok_helixengine_plugin.*
 %{_datadir}/services/amarok_helixengine_plugin.desktop
 %endif
 
+%if 0%{?konq}
+%files konqueror
+%defattr(-,root,root,-)
+%{_datadir}/apps/konqueror/servicemenus/*.desktop
+%{_libdir}/kde3/konqsidebar_universalamarok.*
+%{_datadir}/apps/konqsidebartng/*/amarok.desktop
+%endif
+
 %files visualisation
 %defattr(-,root,root,-)
 %{_bindir}/amarok_libvisual
 
 
 %changelog
+* Thu Feb 21 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.4.8-4
+- -konqueror subpkg (#426803)
+- fix multiarch conflicts (#340641)
+  drop Provides: amarok-devel (f9+), add Obsoletes: amarok-devel
+- gcc43 patch (#433904)
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4.8-3
+- Autorebuild for GCC 4.3
+
+* Wed Jan 09 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.8-2
+- f9+: don't build/include konq(3) side bar support
+
 * Thu Dec 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.8-1
 - amarok-1.4.8

More information about the fedora-extras-commits mailing list