rpms/kdebase/devel kdebase-4.0.1-flash.patch, NONE, 1.1 kdebase.spec, 1.293, 1.294

[Than Ngo (than)]

Author: than

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.0.1-flash.patch 
Log Message:
add flash fix from stable svn branch


kdebase-4.0.1-flash.patch:

--- NEW FILE kdebase-4.0.1-flash.patch ---
Index: apps/nsplugins/viewer/nsplugin.cpp
===================================================================
--- apps/nsplugins/viewer/nsplugin.cpp	(Revision 769143)
+++ apps/nsplugins/viewer/nsplugin.cpp	(Revision 769144)
@@ -1537,6 +1537,12 @@
     return true;
 }
 
+void NSPluginStreamBase::updateURL( const KUrl& newURL )
+{
+    _url = newURL;
+    free(const_cast<char*>(_stream->url));
+    _stream->url = strdup(_url.url().toLatin1().data());
+}
 
 int NSPluginStreamBase::process( const QByteArray &data, int start )
 {
@@ -1764,6 +1770,8 @@
                 SLOT(totalSize(KJob *, qulonglong)));
         connect(_job, SIGNAL(mimetype(KIO::Job *, const QString &)),
                 SLOT(mimetype(KIO::Job *, const QString &)));
+        connect(_job, SIGNAL(redirection(KIO::Job *, const KUrl&)),
+                SLOT(redirection(KIO::Job *, const KUrl&)));
     }
 
     return false;
@@ -1789,6 +1797,8 @@
                 SLOT(totalSize(KJob *, qulonglong)));
         connect(_job, SIGNAL(mimetype(KIO::Job *, const QString &)),
                 SLOT(mimetype(KIO::Job *, const QString &)));
+        connect(_job, SIGNAL(redirection(KIO::Job *, const KUrl&)),
+                SLOT(redirection(KIO::Job *, const KUrl&)));
     }
 
     return false;
@@ -1806,6 +1816,11 @@
     }
 }
 
+void NSPluginStream::redirection(KIO::Job * /*job*/, const KUrl& url)
+{
+    updateURL(url);
+}
+
 void NSPluginStream::totalSize(KJob * job, qulonglong size)
 {
     kDebug(1431) << "NSPluginStream::totalSize - job=" << (void*)job << " size=" << KIO::number(size);
Index: apps/nsplugins/viewer/nsplugin.h
===================================================================
--- apps/nsplugins/viewer/nsplugin.h	(Revision 769143)
+++ apps/nsplugins/viewer/nsplugin.h	(Revision 769144)
@@ -84,6 +84,7 @@
   bool create( const QString& url, const QString& mimeType, void *notify, bool forceNotify = false );
   int tries() { return _tries; }
   void inform( );
+  void updateURL( const KUrl& newUrl );
 
   class NSPluginInstance *_instance;
   uint16 _streamType;
@@ -127,6 +128,7 @@
   void totalSize(KJob *job, qulonglong size);
   void mimetype(KIO::Job * job, const QString &mimeType);
   void result(KJob *job);
+  void redirection(KIO::Job *job, const KUrl& url);
   void resume();
 
 protected:


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- kdebase.spec	31 Jan 2008 18:03:12 -0000	1.293
+++ kdebase.spec	1 Feb 2008 10:54:18 -0000	1.294
@@ -1,29 +1,30 @@
 
-Summary:       K Desktop Environment 4 - Core Files
-Version:       4.0.1
-Release:       1%{?dist}
+Summary: K Desktop Environment 4 - Core Files
+Version: 4.0.1
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
-Name:          kdebase
-Epoch:         6
+Name: kdebase
+Epoch: 6
 
-Obsoletes:     kdebase4 < %{version}-%{release}
-Provides:      kdebase4 = %{version}-%{release}
+Obsoletes: kdebase4 < %{version}-%{release}
+Provides: kdebase4 = %{version}-%{release}
 
-Obsoletes:     %{name}-extras < %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-extras < %{epoch}:%{version}-%{release}
 
 # make -libs subpkg
 %define libs 1
 
 %else
-Name:          kdebase4
+Name: kdebase4
 %endif
 
-License:       GPLv2
-Group:         User Interface/Desktops
-URL:           http://www.kde.org/
-Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+License: GPLv2
+Group: User Interface/Desktops
+URL: http://www.kde.org/
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
+Patch0: kdebase-4.0.1-flash.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -128,7 +129,7 @@
 
 %prep
 %setup -q -n kdebase-%{version}
-
+%patch0 -p1 -b .flash
 
 %build
 
@@ -307,6 +308,9 @@
 
 
 %changelog
+* Fri Feb 01 2008 Than Ngo <than at redhat.com> 4.0.1-2
+- add flash fix from stable svn branch
+
 * Thu Jan 31 2008 Than Ngo <than at redhat.com> 4.0.1-1
 - 4.0.1