rpms/amarok/devel amarok-1.2.4-forward-decl.patch, NONE, 1.1 amarok.spec, 1.15, 1.16

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7768

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.2.4-forward-decl.patch 
Log Message:
merge post-FC-4-split fixes

amarok-1.2.4-forward-decl.patch:

--- NEW FILE amarok-1.2.4-forward-decl.patch ---
diff -Nur amarok-1.2.4-orig/amarok/src/collectionbrowser.h amarok-1.2.4/amarok/src/collectionbrowser.h
--- amarok-1.2.4-orig/amarok/src/collectionbrowser.h	2005-05-19 19:00:19.000000000 +0200
+++ amarok-1.2.4/amarok/src/collectionbrowser.h	2005-06-02 23:30:30.000000000 +0200
@@ -15,6 +15,7 @@
 
 class ClickLineEdit;
 class CollectionDB;
+class CollectionView;
 class sqlite;
 
 class QCString;
diff -Nur amarok-1.2.4-orig/amarok/src/mediabrowser.h amarok-1.2.4/amarok/src/mediabrowser.h
--- amarok-1.2.4-orig/amarok/src/mediabrowser.h	2005-05-19 19:00:19.000000000 +0200
+++ amarok-1.2.4/amarok/src/mediabrowser.h	2005-06-02 23:36:50.000000000 +0200
@@ -39,6 +39,10 @@
 };
 
 
+class MediaDevice;
+class MediaDeviceList;
+class MediaDeviceView;
+
 class MediaBrowser : public QVBox
 {
     Q_OBJECT
diff -Nur amarok-1.2.4-orig/amarok/src/playlistbrowser.h amarok-1.2.4/amarok/src/playlistbrowser.h
--- amarok-1.2.4-orig/amarok/src/playlistbrowser.h	2005-05-19 19:00:19.000000000 +0200
+++ amarok-1.2.4/amarok/src/playlistbrowser.h	2005-06-02 23:34:23.000000000 +0200
@@ -22,6 +22,10 @@
 class QSplitter;
 class QTimer;
 
+class PlaylistBrowserItem;
+class PlaylistBrowserView;
+#include "smartplaylist.h"
+
 class PlaylistBrowser : public QVBox
 {
 Q_OBJECT
@@ -112,6 +116,9 @@
 };
 
 
+class PlaylistTrackItem;
+class TrackItemInfo;
+
 class PlaylistBrowserItem :  public QObject, public KListViewItem
 {
 Q_OBJECT
diff -Nur amarok-1.2.4-orig/amarok/src/smartplaylisteditor.h amarok-1.2.4/amarok/src/smartplaylisteditor.h
--- amarok-1.2.4-orig/amarok/src/smartplaylisteditor.h	2005-05-19 19:00:19.000000000 +0200
+++ amarok-1.2.4/amarok/src/smartplaylisteditor.h	2005-06-02 23:38:48.000000000 +0200
@@ -18,6 +18,7 @@
 class QToolButton;
 class QVGroupBox;
 
+class CriteriaEditor;
 
 class SmartPlaylistEditor : public KDialogBase
 {


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- amarok.spec	29 May 2005 13:51:40 -0000	1.15
+++ amarok.spec	8 Jun 2005 20:12:36 -0000	1.16
@@ -7,13 +7,14 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.2.4
-Release:    1%{?dist}
+Release:    6%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 Source0:    http://dl.sf.net/amarok/amarok-1.2.4.tar.bz2
 Patch0:     amarok-1.2.4-gcc4bl.patch
+Patch1:     amarok-1.2.4-forward-decl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -23,11 +24,11 @@
 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
-%if "%fedora" >= "4"
+#%if "%fedora" >= "4"
 BuildRequires:  libtool-ltdl-devel
-%else
-BuildRequires:  libtool
-%endif
+#%else
+#BuildRequires:  libtool
+#%endif
 
 %if  0%{?use_xine}
 BuildRequires:  xine-lib-devel >= 0:1.0.0
@@ -93,10 +94,13 @@
 %setup -q
 # remove test for GCC blacklisting
 %patch0 -p1 -b .gcc4bl
+%patch1 -p1 -b .forward-decl
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR && . /etc/profile.d/qt.sh
+# work around an improper ${kdelibsuff}
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure \
      --disable-debug \
 %if %{?use_xine:0}%{!?use_xine:1}
@@ -202,6 +206,27 @@
 
 
 %changelog
+* 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
+  compilation with gcc >= 4.0.0-9 fail
+- re-enable SMP make flags
+
+* Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-5.fc4
+- disable SMP make flags, since previous release failed miserably on
+  i386 while the one before it succeeded
+
+* Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-4.fc4
+- set QTLIB and QTINC, so configure script does not search for Qt in
+  QTDIR/lib64 on 64-bit multilib platforms
+
+* Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-3.fc4
+- try to fix build problems (#158654): always set QTDIR, always
+  buildrequire libtool-ltdl-devel, disable %%fedora conditional BR
+
+* Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-2.fc4
+- temporarily add patch to work around Fedora Core bug 159090
+
 * Mon May 23 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.4-1
 - version 1.2.4
 - use dist tag