rpms/azureus/devel .cvsignore, 1.9, 1.10 azureus-fix-menu-MainMenu.patch, 1.1, 1.2 azureus-no-update-manager-CoreUpdateChecker.patch, 1.3, 1.4 azureus-no-update-manager-PluginInstallerImpl.patch, 1.1, 1.2 azureus-no-update-manager-SWTUpdateChecker.patch, 1.3, 1.4 azureus-no-update-manager-UpdateMonitor.patch, 1.4, 1.5 azureus-remove-win32-osx-platforms.patch, 1.2, 1.3 azureus-themed.patch, 1.5, 1.6 azureus.spec, 1.42, 1.43 sources, 1.9, 1.10
Anthony Green (green)
fedora-extras-commits at redhat.com
Thu Mar 29 20:40:15 UTC 2007
- Previous message: rpms/jasper/FC-6 .cvsignore, 1.4, 1.5 jasper.spec, 1.18, 1.19 sources, 1.3, 1.4 jasper-1.701.0-memory_leak.patch, 1.1, NONE
- Next message: rpms/azureus/FC-6 .cvsignore, 1.9, 1.10 azureus-fix-menu-MainMenu.patch, 1.1, 1.2 azureus-no-update-manager-CoreUpdateChecker.patch, 1.3, 1.4 azureus-no-update-manager-PluginInstallerImpl.patch, 1.1, 1.2 azureus-no-update-manager-SWTUpdateChecker.patch, 1.3, 1.4 azureus-no-update-manager-UpdateMonitor.patch, 1.4, 1.5 azureus-remove-win32-osx-platforms.patch, 1.2, 1.3 azureus-themed.patch, 1.5, 1.6 azureus.spec, 1.41, 1.42 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: green
Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28580
Modified Files:
.cvsignore azureus-fix-menu-MainMenu.patch
azureus-no-update-manager-CoreUpdateChecker.patch
azureus-no-update-manager-PluginInstallerImpl.patch
azureus-no-update-manager-SWTUpdateChecker.patch
azureus-no-update-manager-UpdateMonitor.patch
azureus-remove-win32-osx-platforms.patch azureus-themed.patch
azureus.spec sources
Log Message:
Upgrade to 2.5.0.4.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 27 Aug 2006 00:33:46 -0000 1.9
+++ .cvsignore 29 Mar 2007 20:39:35 -0000 1.10
@@ -1,7 +1 @@
-azureus2-2.5.0.0.tar.gz
-azureus.script
-Azureus.desktop
-azureus.applications
-azureus-License.txt
-azplugins_1.9.jar
-bdcc_2.2.2.zip
+azureus2-2.5.0.4.tar.gz
azureus-fix-menu-MainMenu.patch:
Index: azureus-fix-menu-MainMenu.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-fix-menu-MainMenu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-fix-menu-MainMenu.patch 27 Aug 2006 00:36:15 -0000 1.1
+++ azureus-fix-menu-MainMenu.patch 29 Mar 2007 20:39:35 -0000 1.2
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.orig 2006-08-26 17:09:20.000000000 -0700
-+++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-08-26 17:10:24.000000000 -0700
-@@ -195,21 +195,10 @@
+--- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.orig 2007-01-12 17:51:47.000000000 -0800
++++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2007-03-29 12:55:44.000000000 -0700
+@@ -200,21 +200,10 @@
addCloseDetailsMenuItem(fileMenu);
addCloseDownloadBarsToMenu(fileMenu);
@@ -22,7 +22,7 @@
final MenuItem file_exit = new MenuItem(fileMenu, SWT.NULL);
if(!COConfigurationManager.getBooleanParameter("Enable System Tray") || !COConfigurationManager.getBooleanParameter("Close To Tray")) {
KeyBindings.setAccelerator(file_exit, "MainWindow.menu.file.exit");
-@@ -376,26 +365,6 @@
+@@ -381,26 +370,6 @@
menu_plugin_logViews.setMenu(pluginLogsMenu);
menu_plugin_logViews.setData("EOL", "1");
@@ -49,16 +49,17 @@
// standard items
if(Constants.isOSX) {
// Window menu
-@@ -470,32 +439,8 @@
+@@ -478,49 +447,8 @@
+ }
});
-
+-
- MenuItem help_plugin= new MenuItem(helpMenu, SWT.NULL);
- Messages.setLanguageText(help_plugin, "MainWindow.menu.help.plugins"); //$NON-NLS-1$
- help_plugin.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event e) {
- String pluginString = "http://azureus.sourceforge.net/plugin_list.php";
-- Program.launch(pluginString);
+- Utils.launch(pluginString);
- }
- });
-
@@ -74,22 +75,27 @@
- if (uiFunctions != null) {
- uiFunctions.bringToFront();
- }
-- UpdateMonitor.getSingleton(core).performCheck(true);
+- UpdateMonitor.getSingleton(core).performCheck(true, false, new UpdateCheckInstanceListener() {
+- public void cancelled(UpdateCheckInstance instance) {
+- }
+-
+- public void complete(UpdateCheckInstance instance) {
+- if (instance.getUpdates().length == 0) {
+- Utils.execSWTThread(new AERunnable() {
+- public void runSupport() {
+- Utils.openMessageBox(parent,
+- SWT.ICON_INFORMATION | SWT.OK,
+- "window.update.noupdates", (String[]) null);
+- }
+- });
+- }
+- }
+- });
- }
- });
- }
-
- MenuItem help_donate = new MenuItem(helpMenu, SWT.NULL);
- Messages.setLanguageText(help_donate, "MainWindow.menu.help.donate"); //$NON-NLS-1$
- help_donate.addListener(SWT.Selection, new Listener() {
-@@ -503,8 +448,8 @@
- new DonationWindow2(display).show();
- //String donationString = "https://www.paypal.com/xclick/business=olivier%40gudy.org&item_name=Azureus&no_note=1&tax=0¤cy_code=EUR";
- //Program.launch(donationString);
-- }
-- });
-+ }
-+ });
-
- new MenuItem(helpMenu,SWT.SEPARATOR);
+- new MenuItem(helpMenu,SWT.SEPARATOR);
MenuItem help_debug = new MenuItem(helpMenu, SWT.NULL);
+ Messages.setLanguageText(help_debug, "MainWindow.menu.help.debug");
+ help_debug.addListener(SWT.Selection, new Listener() {
azureus-no-update-manager-CoreUpdateChecker.patch:
Index: azureus-no-update-manager-CoreUpdateChecker.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-update-manager-CoreUpdateChecker.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- azureus-no-update-manager-CoreUpdateChecker.patch 29 May 2006 16:02:45 -0000 1.3
+++ azureus-no-update-manager-CoreUpdateChecker.patch 29 Mar 2007 20:39:35 -0000 1.4
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/update/CoreUpdateChecker.java.orig 2006-05-14 08:10:03.000000000 -0700
-+++ org/gudy/azureus2/update/CoreUpdateChecker.java 2006-05-26 09:23:28.000000000 -0700
-@@ -123,8 +123,6 @@
+--- org/gudy/azureus2/update/CoreUpdateChecker.java.orig 2006-12-20 17:14:36.000000000 -0800
++++ org/gudy/azureus2/update/CoreUpdateChecker.java 2007-03-29 12:46:47.000000000 -0700
+@@ -122,8 +122,6 @@
props.setProperty( "plugin.version", plugin_interface.getAzureusVersion());
rdf = plugin_interface.getUtilities().getResourceDownloaderFactory();
@@ -9,7 +9,7 @@
}
public String
-@@ -143,156 +141,9 @@
+@@ -142,235 +140,9 @@
checkForUpdate(
final UpdateChecker checker )
{
@@ -24,8 +24,8 @@
-
- displayUserMessage( decoded );
-
-- String latest_version = null;
-- String latest_file_name = null;
+- String latest_version;
+- String latest_file_name;
-
- byte[] b_version = (byte[])decoded.get("version");
-
@@ -45,10 +45,44 @@
- if ( b_filename != null ){
-
- latest_file_name = new String( b_filename );
+-
+- }else{
+-
+- throw( new Exception( "No update file details in reply" ));
- }
-
+- //latest_version = "3.0.0.3";
+- //latest_file_name = "http://torrents.aelitis.com:88/torrents/Azureus2.5.0.0.jar.torrent";
+- //latest_file_name = "Azureus2.5.0.0.jar.torrent";
+-
- String msg = "Core: latest_version = '" + latest_version + "', file = '" + latest_file_name + "'";
-
+- URL full_download_url;
+-
+- // since 2501 we support a full download URL, falling back to SF mirrors if this
+- // fails.
+-
+- if ( latest_file_name.startsWith( "http" )){
+-
+- try{
+- full_download_url = new URL( latest_file_name );
+-
+- }catch( Throwable e ){
+-
+- full_download_url = null;
+-
+- log.log( e );
+- }
+-
+- int pos = latest_file_name.lastIndexOf( '/' );
+-
+- latest_file_name = latest_file_name.substring( pos+1 );
+-
+- }else{
+-
+- full_download_url = null;
+- }
+-
- checker.reportProgress( msg );
-
- log.log( msg );
@@ -61,40 +95,85 @@
- final String f_latest_version = latest_version;
- final String f_latest_file_name = latest_file_name;
-
--
-- ResourceDownloader[] primary_mirrors;
+- ResourceDownloader top_downloader;
+-
+- if ( full_download_url == null ){
+-
+- ResourceDownloader[] primary_mirrors;
+-
+- primary_mirrors = getPrimaryDownloaders( latest_file_name );
+-
+- // the download hierarchy is primary mirrors first (randomised alternate)
+- // then backup mirrors (randomised alternate)
-
-- primary_mirrors = getPrimaryDownloaders( latest_file_name );
+- // we don't want to load the backup mirrors until the primary mirrors fail
+-
+- ResourceDownloader random_primary_mirrors = rdf.getRandomDownloader( primary_mirrors );
+-
+- ResourceDownloader backup_downloader =
+- rdf.create(
+- new ResourceDownloaderDelayedFactory()
+- {
+- public ResourceDownloader
+- create()
+- {
+- ResourceDownloader[] backup_mirrors = getBackupDownloaders( f_latest_file_name );
+-
+- return( rdf.getRandomDownloader( backup_mirrors ));
+- }
+- });
+-
+- top_downloader =
+- rdf.getAlternateDownloader(
+- new ResourceDownloader[]
+- {
+- random_primary_mirrors,
+- backup_downloader,
+- });
-
-- // the download hierarchy is primary mirrors first (randomised alternate)
-- // then backup mirrors (randomised alternate)
--
-- // we don't want to load the backup mirrors until the primary mirrors fail
--
-- ResourceDownloader random_primary_mirrors = rdf.getRandomDownloader( primary_mirrors );
--
-- ResourceDownloader backup_downloader =
-- rdf.create(
-- new ResourceDownloaderDelayedFactory()
-- {
-- public ResourceDownloader
-- create()
+- }else{
+-
+- ResourceDownloader full_rd = rdf.create( full_download_url );
+-
+- full_rd = rdf.getSuffixBasedDownloader( full_rd );
+-
+- ResourceDownloader primary_downloader =
+- rdf.create(
+- new ResourceDownloaderDelayedFactory()
- {
-- ResourceDownloader[] backup_mirrors = getBackupDownloaders( f_latest_file_name );
--
-- return( rdf.getRandomDownloader( backup_mirrors ));
-- }
-- });
--
-- ResourceDownloader top_downloader =
-- rdf.getAlternateDownloader(
-- new ResourceDownloader[]
+- public ResourceDownloader
+- create()
+- {
+- ResourceDownloader[] primary_mirrors = getPrimaryDownloaders( f_latest_file_name );
+-
+- return( rdf.getRandomDownloader( primary_mirrors ));
+- }
+- });
+-
+- ResourceDownloader backup_downloader =
+- rdf.create(
+- new ResourceDownloaderDelayedFactory()
+- {
+- public ResourceDownloader
+- create()
- {
-- random_primary_mirrors,
-- backup_downloader,
-- });
+- ResourceDownloader[] backup_mirrors = getBackupDownloaders( f_latest_file_name );
+-
+- return( rdf.getRandomDownloader( backup_mirrors ));
+- }
+- });
+-
+-
+- top_downloader =
+- rdf.getAlternateDownloader(
+- new ResourceDownloader[]
+- {
+- full_rd,
+- primary_downloader,
+- backup_downloader,
+- });
+- }
-
--
- top_downloader.addListener( rd_logger );
-
- // get size so it is cached
azureus-no-update-manager-PluginInstallerImpl.patch:
Index: azureus-no-update-manager-PluginInstallerImpl.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-update-manager-PluginInstallerImpl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-update-manager-PluginInstallerImpl.patch 10 Feb 2006 17:00:46 -0000 1.1
+++ azureus-no-update-manager-PluginInstallerImpl.patch 29 Mar 2007 20:39:35 -0000 1.2
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.orig 2006-02-09 23:30:18.000000000 -0500
-+++ org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java 2006-02-09 23:32:16.000000000 -0500
-@@ -177,13 +177,6 @@
+--- org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java.orig 2006-09-09 17:59:14.000000000 -0700
++++ org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java 2007-03-29 12:48:29.000000000 -0700
+@@ -181,13 +181,6 @@
{
PluginUpdatePlugin pup = (PluginUpdatePlugin)manager.getPluginInterfaceByClass( PluginUpdatePlugin.class ).getPlugin();
@@ -14,7 +14,7 @@
try{
for (int i=0;i<plugins.length;i++){
-@@ -247,23 +240,6 @@
+@@ -251,23 +244,6 @@
((InstallablePluginImpl)plugin).addUpdate( inst, pup, dummy_plugin, dummy_plugin_interface );
@@ -38,7 +38,7 @@
}else{
((InstallablePluginImpl)plugin).addUpdate( inst, pup, existing_plugin, existing_plugin_interface );
-@@ -271,12 +247,8 @@
+@@ -275,12 +251,8 @@
}
}
@@ -51,7 +51,7 @@
if ( e instanceof PluginException ){
throw((PluginException)e);
-@@ -339,137 +311,6 @@
+@@ -343,137 +315,6 @@
throw( new PluginException( "Plugin '" + pi.getPluginID() + "' is not loaded from the file system, can't uninstall" ));
}
}
@@ -108,12 +108,12 @@
-
- FileUtil.recursiveDelete( new File( plugin_dir ));
-
-- }else{
+- }
-
-- UpdateInstaller installer = checker.createInstaller();
+- UpdateInstaller installer = checker.createInstaller();
-
-- installer.addRemoveAction( new File( plugin_dir ).getCanonicalPath());
-- }
+- installer.addRemoveAction( new File( plugin_dir ).getCanonicalPath());
+-
-
- }catch( Throwable e ){
-
azureus-no-update-manager-SWTUpdateChecker.patch:
Index: azureus-no-update-manager-SWTUpdateChecker.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-update-manager-SWTUpdateChecker.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- azureus-no-update-manager-SWTUpdateChecker.patch 27 Aug 2006 00:33:46 -0000 1.3
+++ azureus-no-update-manager-SWTUpdateChecker.patch 29 Mar 2007 20:39:35 -0000 1.4
@@ -1,13 +1,6 @@
---- org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.orig 2006-07-29 16:23:50.000000000 -0700
-+++ org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2006-08-23 12:18:50.000000000 -0700
-@@ -63,164 +63,13 @@
- public static void
- initialize()
- {
-- PluginInitializer.getDefaultInterface().getUpdateManager().registerUpdatableComponent(new SWTUpdateChecker(),true);
- }
-
- public SWTUpdateChecker() {
+--- org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.orig 2006-12-27 18:52:24.000000000 -0800
++++ org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2007-03-29 12:50:21.000000000 -0700
+@@ -71,172 +71,10 @@
}
public void checkForUpdate(final UpdateChecker checker) {
@@ -66,7 +59,20 @@
- }
- }else{
-
-- if ( update_prevented_version != versionGetter.getCurrentVersion()){
+- // we need to periodically remind the user there's a problem as they need to realise that
+- // it is causing ALL updates (core/plugin) to fail
+-
+- long last_prompt = COConfigurationManager.getLongParameter( "swt.update.prevented.version.time", 0 );
+- long now = SystemTime.getCurrentTime();
+-
+- boolean force = now < last_prompt || now - last_prompt > 7*24*60*60*1000;
+-
+- if ( !checker.getCheckInstance().isAutomatic()){
+-
+- force = true;
+- }
+-
+- if ( force || update_prevented_version != versionGetter.getCurrentVersion()){
-
- String alert =
- MessageText.getString(
@@ -77,11 +83,12 @@
- jar_file_dir.toString(),
- expected_dir.toString()});
-
-- Logger.log( new LogAlert(LogAlert.UNREPEATABLE, LogEvent.LT_ERROR, alert ));
+- Logger.log( new LogAlert(LogAlert.REPEATABLE, LogEvent.LT_ERROR, alert ));
-
- update_prevented_version = versionGetter.getCurrentVersion();
-
- COConfigurationManager.setParameter( "swt.update.prevented.version", update_prevented_version );
+- COConfigurationManager.setParameter( "swt.update.prevented.version.time", now );
- }
- }
- }
@@ -158,11 +165,12 @@
- checker.failed();
-
- }finally{
--
-- checker.completed();
+
+ checker.completed();
- }
-
-+ checker.completed();
}
++
private boolean
+ processData(
azureus-no-update-manager-UpdateMonitor.patch:
Index: azureus-no-update-manager-UpdateMonitor.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-no-update-manager-UpdateMonitor.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- azureus-no-update-manager-UpdateMonitor.patch 27 Aug 2006 00:33:46 -0000 1.4
+++ azureus-no-update-manager-UpdateMonitor.patch 29 Mar 2007 20:39:35 -0000 1.5
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-08-21 19:13:04.000000000 -0700
-+++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2006-08-23 12:22:40.000000000 -0700
-@@ -90,213 +90,17 @@
+--- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-12-27 18:52:24.000000000 -0800
++++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2007-03-29 12:52:02.000000000 -0700
+@@ -90,150 +90,12 @@
{
azureus_core = _azureus_core;
@@ -125,7 +125,7 @@
- if ( ( check_at_start && start_of_day) ||
- ( check_periodic && !start_of_day )){
-
-- performCheck(bOldSWT); // this will implicitly do usage stats
+- performCheck(bOldSWT, true, null); // this will implicitly do usage stats
-
- }else{
-
@@ -149,9 +149,11 @@
- });
- }
}
-
+
public void
- performCheck(final boolean bForce)
+@@ -242,72 +104,7 @@
+ final boolean automatic,
+ final UpdateCheckInstanceListener l )
{
- if ( SystemProperties.isJavaWebStartInstance()){
-
@@ -162,7 +164,7 @@
-
- return;
- }
--
+
- // kill any existing update window
-
- if ( current_update_window != null && ! current_update_window.isDisposed()){
@@ -204,6 +206,14 @@
- bForce ? UpdateCheckInstance.UCI_INSTALL : UpdateCheckInstance.UCI_UPDATE,
- "update.instance.update" );
-
+- if ( !automatic ){
+-
+- current_update_instance.setAutomatic( false );
+- }
+-
+- if (l != null) {
+- current_update_instance.addListener(l);
+- }
- current_update_instance.start();
- }
- };
azureus-remove-win32-osx-platforms.patch:
Index: azureus-remove-win32-osx-platforms.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-remove-win32-osx-platforms.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- azureus-remove-win32-osx-platforms.patch 9 Feb 2006 08:45:07 -0000 1.2
+++ azureus-remove-win32-osx-platforms.patch 29 Mar 2007 20:39:35 -0000 1.3
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/platform/PlatformManagerFactory.java.orig 2005-09-12 12:00:07.000000000 -0700
-+++ org/gudy/azureus2/platform/PlatformManagerFactory.java 2006-01-25 11:25:11.000000000 -0800
-@@ -43,32 +43,7 @@
+--- org/gudy/azureus2/platform/PlatformManagerFactory.java.orig 2007-01-12 12:39:23.000000000 -0800
++++ org/gudy/azureus2/platform/PlatformManagerFactory.java 2007-03-29 12:39:21.000000000 -0700
+@@ -43,36 +43,7 @@
try{
class_mon.enter();
@@ -15,6 +15,10 @@
-
- platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();
-
+- }else if( getPlatformType() == PlatformManager.PT_UNIX ){
+-
+- platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton();
+-
- }
- }catch( PlatformManagerException e ){
-
azureus-themed.patch:
Index: azureus-themed.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-themed.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- azureus-themed.patch 27 Aug 2006 00:33:46 -0000 1.5
+++ azureus-themed.patch 29 Mar 2007 20:39:35 -0000 1.6
@@ -1,15 +1,6 @@
---- org/gudy/azureus2/ui/swt/ImageRepository.java.orig 2006-08-21 19:12:59.000000000 -0700
-+++ org/gudy/azureus2/ui/swt/ImageRepository.java 2006-08-23 12:12:06.000000000 -0700
-@@ -32,6 +32,8 @@
- import java.io.ByteArrayOutputStream;
- import java.io.File;
- import java.io.InputStream;
-+import java.io.FileInputStream;
-+import java.io.FileNotFoundException;
- import java.lang.reflect.Method;
- import java.util.*;
-
-@@ -61,6 +63,25 @@
+--- org/gudy/azureus2/ui/swt/ImageRepository.java.orig 2007-01-19 17:09:35.000000000 -0800
++++ org/gudy/azureus2/ui/swt/ImageRepository.java 2007-03-29 12:42:58.000000000 -0700
+@@ -67,6 +67,25 @@
addPath("org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash");
}
@@ -33,15 +24,14 @@
+ }
+
public static void loadImages(Display display) {
- addPath("org/gudy/azureus2/ui/icons/a32.png", "azureus32");
- addPath("org/gudy/azureus2/ui/icons/a64.png", "azureus64");
-@@ -106,22 +127,22 @@
+
+ if(Constants.isOSX) {
+@@ -119,22 +138,22 @@
//ToolBar Icons
addPath("org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open");
- addPath("org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif",
-+ addPath(getThemedIcon("fileopen", "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif"),
- "cb_open_no_default");
+- "cb_open_no_default");
addPath("org/gudy/azureus2/ui/icons/toolbar/open_folder.gif",
"cb_open_folder");
addPath("org/gudy/azureus2/ui/icons/toolbar/open_url.gif", "cb_open_url");
@@ -56,21 +46,23 @@
- addPath("org/gudy/azureus2/ui/icons/toolbar/remove.gif", "cb_remove");
- addPath("org/gudy/azureus2/ui/icons/toolbar/host.gif", "cb_host");
- addPath("org/gudy/azureus2/ui/icons/toolbar/publish.gif", "cb_publish");
-+ addPath(getThemedIcon("filenew", "org/gudy/azureus2/ui/icons/toolbar/new.gif"), "cb_new");
-+ addPath(getThemedIcon("gtk-go-up", "org/gudy/azureus2/ui/icons/toolbar/up.gif"), "cb_up");
-+ addPath(getThemedIcon("gtk-go-down", "org/gudy/azureus2/ui/icons/toolbar/down.gif"), "cb_down");
-+ addPath(getThemedIcon("gtk-goto-top", "org/gudy/azureus2/ui/icons/toolbar/top.gif"), "cb_top");
-+ addPath(getThemedIcon("gtk-goto-bottom", "org/gudy/azureus2/ui/icons/toolbar/bottom.gif"), "cb_bottom");
-+ addPath(getThemedIcon("exec", "org/gudy/azureus2/ui/icons/toolbar/run.gif"), "cb_run");
-+ addPath(getThemedIcon("gtk-go-forward", "org/gudy/azureus2/ui/icons/toolbar/start.gif"), "cb_start");
-+ addPath(getThemedIcon("gtk-stop", "org/gudy/azureus2/ui/icons/toolbar/stop.gif"), "cb_stop");
-+ addPath(getThemedIcon("edit_remove", "org/gudy/azureus2/ui/icons/toolbar/remove.gif"), "cb_remove");
-+ addPath(getThemedIcon("gohome", "org/gudy/azureus2/ui/icons/toolbar/host.gif"), "cb_host");
-+ addPath(getThemedIcon("icon-html", "org/gudy/azureus2/ui/icons/toolbar/publish.gif"), "cb_publish");
- addPath("org/gudy/azureus2/ui/icons/toolbar/sendto.png", "cb_send");
++ addPath(getThemedIcon("fileopen", "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif"),
++ "cb_open_no_default");
++ addPath(getThemedIcon("filenew", "org/gudy/azureus2/ui/icons/toolbar/new.gif"), "cb_new");
++ addPath(getThemedIcon("gtk-go-up", "org/gudy/azureus2/ui/icons/toolbar/up.gif"), "cb_up");
++ addPath(getThemedIcon("gtk-go-down", "org/gudy/azureus2/ui/icons/toolbar/down.gif"), "cb_down");
++ addPath(getThemedIcon("gtk-goto-top", "org/gudy/azureus2/ui/icons/toolbar/top.gif"), "cb_top");
++ addPath(getThemedIcon("gtk-goto-bottom", "org/gudy/azureus2/ui/icons/toolbar/bottom.gif"), "cb_bottom");
++ addPath(getThemedIcon("exec", "org/gudy/azureus2/ui/icons/toolbar/run.gif"), "cb_run");
++ addPath(getThemedIcon("gtk-go-forward", "org/gudy/azureus2/ui/icons/toolbar/start.gif"), "cb_start");
++ addPath(getThemedIcon("gtk-stop", "org/gudy/azureus2/ui/icons/toolbar/stop.gif"), "cb_stop");
++ addPath(getThemedIcon("edit_remove", "org/gudy/azureus2/ui/icons/toolbar/remove.gif"), "cb_remove");
++ addPath(getThemedIcon("gohome", "org/gudy/azureus2/ui/icons/toolbar/host.gif"), "cb_host");
++ addPath(getThemedIcon("icon-html", "org/gudy/azureus2/ui/icons/toolbar/publish.gif"), "cb_publish");
//Status icons
-@@ -181,6 +202,16 @@
+ addPath("org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok");
+@@ -195,6 +214,16 @@
Image im = getImage(name,false);
if(null == im) {
InputStream is = loader.getResourceAsStream(res);
@@ -87,10 +79,3 @@
if(null != is) {
try {
if(alpha == 255) {
-@@ -513,4 +544,4 @@
-
- return key;
- }
--}
-\ No newline at end of file
-+}
Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- azureus.spec 28 Mar 2007 21:07:48 -0000 1.42
+++ azureus.spec 29 Mar 2007 20:39:35 -0000 1.43
@@ -1,8 +1,8 @@
# ExclusiveArch: %{ix86} x86_64
Name: azureus
-Version: 2.5.0.0
-Release: 12%{?dist}
+Version: 2.5.0.4
+Release: 1%{?dist}
Summary: A BitTorrent Client
Group: Applications/Internet
@@ -11,7 +11,7 @@
# A cvs snapshot with the build and bouncycastle directories
# removed.
-Source0: azureus2-2.5.0.0.tar.gz
+Source0: azureus2-2.5.0.4.tar.gz
Source1: azureus.script
Source2: Azureus.desktop
@@ -39,7 +39,7 @@
Patch22: azureus-no-update-manager-UpdateMonitor.patch
Patch23: azureus-no-update-manager-PluginInstallerImpl-2.patch
Patch25: azureus-no-update-manager-MainStatusBar.patch
-Patch26: azureus-nativetabs.patch
+#Patch26: azureus-nativetabs.patch
Patch27: azureus-SecureMessageServiceClientHelper-bcprov.patch
Patch28: azureus-UDPConnectionSet-bcprov.patch
Patch29: azureus-CryptoHandlerECC-bcprov.patch
@@ -91,7 +91,7 @@
%patch22 -p0
%patch23 -p0
%patch25 -p0
-%patch26 -p0
+#%patch26 -p0
%patch27 -p0
#%patch28 -p0
#%patch29 -p0
@@ -105,7 +105,8 @@
ln -s %{_libdir}/eclipse/swt-gtk-3.2.jar build/libs
find ./ -name osx | xargs rm -r
find ./ -name macosx | xargs rm -r
-find ./ -name [Ww]in32\* | xargs rm -r
+find ./ -name win32 | xargs rm -r
+find ./ -name Win32\* | xargs rm -r
# Remove test code
rm org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java
@@ -206,6 +207,9 @@
%{_libdir}/gcj/*
%changelog
+* Thu Mar 29 2007 Anthony Green <green at redhat.com> 2.5.0.4-1
+- Upgrade to 2.5.0.4.
+
* Wed Mar 28 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.5.0.0-12
- Remove gnu-crypto build and runtime requirements.
- Do not include gnu-crypto in classpath.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 27 Aug 2006 00:33:46 -0000 1.9
+++ sources 29 Mar 2007 20:39:35 -0000 1.10
@@ -1,7 +1 @@
-6b44cdef9e870f47b47c5b106810b58c azureus2-2.5.0.0.tar.gz
-94099614e47818573457ea589c8db337 azureus.script
-86bbc699204ed85d2d03fe34c6968b63 Azureus.desktop
-ed21a731b08376fd9189de906b1efb90 azureus.applications
-7f8fc22bebf84c197b19c6593c6d39ed azureus-License.txt
-7879202464bf4145f7d4848fb5f0e04f azplugins_1.9.jar
-0e88c3952b36ba221e277420a7080b43 bdcc_2.2.2.zip
+e0f146acd013c603bf5acc89b7fc7e33 azureus2-2.5.0.4.tar.gz
- Previous message: rpms/jasper/FC-6 .cvsignore, 1.4, 1.5 jasper.spec, 1.18, 1.19 sources, 1.3, 1.4 jasper-1.701.0-memory_leak.patch, 1.1, NONE
- Next message: rpms/azureus/FC-6 .cvsignore, 1.9, 1.10 azureus-fix-menu-MainMenu.patch, 1.1, 1.2 azureus-no-update-manager-CoreUpdateChecker.patch, 1.3, 1.4 azureus-no-update-manager-PluginInstallerImpl.patch, 1.1, 1.2 azureus-no-update-manager-SWTUpdateChecker.patch, 1.3, 1.4 azureus-no-update-manager-UpdateMonitor.patch, 1.4, 1.5 azureus-remove-win32-osx-platforms.patch, 1.2, 1.3 azureus-themed.patch, 1.5, 1.6 azureus.spec, 1.41, 1.42 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list