[azureus] - upgrade to Vuxe 4.6.0.4

[David Juran]

commit c7a731bf1e07a573ab439bdee2ef95ceb97c7afe
Author: David Juran <djuran at redhat.com>
Date:   Sun Apr 3 13:31:13 2011 +0300

    - upgrade to Vuxe 4.6.0.4

 .gitignore                                 |    1 +
 azureus-no-updates-PluginInitializer.patch |   52 ++++++++++++++--------------
 azureus.spec                               |    7 +++-
 sources                                    |    2 +-
 4 files changed, 33 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 87bfaba..502da30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ Vuze_4502_source.zip
 /Vuze_4510_source.zip
 /Vuze_4600_source.zip
 /Vuze_4602_source.zip
+/Vuze_4604_source.zip
diff --git a/azureus-no-updates-PluginInitializer.patch b/azureus-no-updates-PluginInitializer.patch
index c202a27..59a044e 100644
--- a/azureus-no-updates-PluginInitializer.patch
+++ b/azureus-no-updates-PluginInitializer.patch
@@ -1,7 +1,7 @@
-diff -up azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.no-updates-PluginInitializer azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java
---- azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.no-updates-PluginInitializer	2010-07-31 01:00:40.000000000 +0300
-+++ azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java	2010-08-05 20:33:30.000000000 +0300
-@@ -40,12 +40,8 @@ import org.gudy.azureus2.core3.util.*;
+diff -up azureus-4.6.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.no-updates-PluginInitializer azureus-4.6.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java
+--- azureus-4.6.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.no-updates-PluginInitializer	2011-03-08 19:09:54.000000000 +0200
++++ azureus-4.6.0.4/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java	2011-04-02 17:15:52.000000000 +0300
+@@ -41,12 +41,8 @@ import org.gudy.azureus2.core3.util.*;
  import org.gudy.azureus2.plugins.*;
  import org.gudy.azureus2.pluginsimpl.local.launch.PluginLauncherImpl;
  import org.gudy.azureus2.pluginsimpl.local.ui.UIManagerImpl;
@@ -14,7 +14,7 @@ diff -up azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.j
  
  import com.aelitis.azureus.core.*;
  import com.aelitis.azureus.core.versioncheck.VersionCheckClient;
-@@ -97,12 +93,12 @@ PluginInitializer
+@@ -98,12 +94,12 @@ PluginInitializer
     					"ShareHoster",
  					"true",
  					"false"},
@@ -33,7 +33,7 @@ diff -up azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.j
  			{	 PluginManagerDefaults.PID_UPNP, 
  				    "com.aelitis.azureus.plugins.upnp.UPnPPlugin", 
  				    "azbpupnp", 
-@@ -127,18 +123,18 @@ PluginInitializer
+@@ -128,18 +124,18 @@ PluginInitializer
  					"Magnet URI Handler",
  					"true",
  					"false"},
@@ -64,7 +64,7 @@ diff -up azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.j
  	   		{	 PluginManagerDefaults.PID_PLATFORM_CHECKER, 
     					"org.gudy.azureus2.platform.PlatformManagerPluginDelegate", 
     					"azplatform2", 
-@@ -457,7 +453,7 @@ PluginInitializer
+@@ -458,7 +454,7 @@ PluginInitializer
    	
    	core_operation 	= _core_operation;
      
@@ -73,7 +73,7 @@ diff -up azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.j
         
      plugin_manager = PluginManagerImpl.getSingleton( this );
      
-@@ -479,7 +475,7 @@ PluginInitializer
+@@ -480,7 +476,7 @@ PluginInitializer
      	}
      }
      
@@ -82,21 +82,21 @@ diff -up azureus-4.5.0.0/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.j
    }
    
    protected void
-@@ -1233,9 +1229,6 @@ PluginInitializer
- 		      if ( load_failure != null ){
- 		    	  plugin_interface.setAsFailed();
- 		    	  
--		    	// don't complain about our internal one
--		    	  if ( !pid.equals(UpdaterUpdateChecker.getPluginID())){
--		    		  
- 			      	String msg = "Error loading plugin '" + pluginName + "' / '" + plugin_class_string + "'";
- 			      	LogAlert la;
- 			      	if (load_failure instanceof UnsupportedClassVersionError) {
-@@ -1247,7 +1240,6 @@ PluginInitializer
- 			      	Logger.log(la);
- 		
- 			      	System.out.println( msg + ": " + load_failure);
--			      }
- 		      }
- 	  		}
-   		}
+@@ -1291,9 +1287,6 @@ PluginInitializer
+ 					  if ( load_failure != null ){
+ 						  plugin_interface.setAsFailed();
+ 
+-						  // don't complain about our internal one
+-						  if ( !pid.equals(UpdaterUpdateChecker.getPluginID())){
+-
+ 							  String msg = "Error loading plugin '" + pluginName + "' / '" + plugin_class_string + "'";
+ 							  LogAlert la;
+ 							  if (load_failure instanceof UnsupportedClassVersionError) {
+@@ -1305,7 +1298,6 @@ PluginInitializer
+ 							  Logger.log(la);
+ 
+ 							  System.out.println( msg + ": " + load_failure);
+-						  }
+ 					  }
+ 				  }
+ 			  }
diff --git a/azureus.spec b/azureus.spec
index 87b9ce9..8e3c35e 100644
--- a/azureus.spec
+++ b/azureus.spec
@@ -1,14 +1,14 @@
 %global		_newname Vuze
 
 Name:		azureus
-Version:	4.6.0.2
+Version:	4.6.0.4
 Release:	1%{?dist}
 Summary:	A BitTorrent Client
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://azureus.sourceforge.net
 
-Source0:	http://downloads.sourceforge.net/azureus/%{_newname}_4602_source.zip
+Source0:	http://downloads.sourceforge.net/azureus/%{_newname}_4604_source.zip
 
 Source1:	azureus.script
 Source2:	Azureus.desktop
@@ -237,6 +237,9 @@ fi
 %{_datadir}/azureus
 
 %changelog
+* Sat Apr  2 2011 David Juran <djuran at redhat.com> - 4.6.0.4-1
+- upgrade to Vuxe 4.6.0.4
+
 * Thu Feb 10 2011 David Juran <djuran at redhat.com> - 4.6.0.2-1
 - upgrade to Vuze 4.6.0.2
 - clean up not needed patches
diff --git a/sources b/sources
index b57f379..c0f5a34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-053357377b8bfc58f77a6e4f6778d5df  Vuze_4602_source.zip
+e027d0f89a85c4d97dabce44aa232f86  Vuze_4604_source.zip