rpms/azureus/devel .cvsignore, 1.11, 1.12 azureus-fix-menu-MainMenu.patch, 1.2, 1.3 azureus-no-update-manager-CoreUpdateChecker.patch, 1.4, 1.5 azureus-no-update-manager-PluginInstallerImpl.patch, 1.2, 1.3 azureus-no-update-manager-SWTUpdateChecker.patch, 1.4, 1.5 azureus-no-update-manager-UpdateMonitor.patch, 1.5, 1.6 azureus-no-updates-PluginInitializer.patch, 1.2, 1.3 azureus-remove-win32-osx-platforms.patch, 1.3, 1.4 azureus-themed.patch, 1.6, 1.7 azureus.spec, 1.46, 1.47 sources, 1.11, 1.12 azureus-CryptoHandlerECC-bcprov.patch, 1.1, NONE azureus-CryptoSTSEngineImpl-bcprov.patch, 1.2, NONE azureus-UDPConnectionSet-bcprov.patch, 1.1, NONE azureus-nativetabs.patch, 1.2, NONE azureus-remove-win32-PlatformManagerUpdateChecker.patch, 1.3, NONE
Lillian Angel (langel)
fedora-extras-commits at redhat.com
Mon Dec 3 17:04:01 UTC 2007
- Previous message (by thread): rpms/postgresql-odbc/F-8 .cvsignore, 1.9, 1.10 postgresql-odbc.spec, 1.21, 1.22 sources, 1.9, 1.10
- Next message (by thread): rpms/libtranslate/F-8 libtranslate-0.99-services.patch, NONE, 1.1 libtranslate-add_Promt_service.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: langel
Update of /cvs/pkgs/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13192
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-no-updates-PluginInitializer.patch
azureus-remove-win32-osx-platforms.patch azureus-themed.patch
azureus.spec sources
Removed Files:
azureus-CryptoHandlerECC-bcprov.patch
azureus-CryptoSTSEngineImpl-bcprov.patch
azureus-UDPConnectionSet-bcprov.patch azureus-nativetabs.patch
azureus-remove-win32-PlatformManagerUpdateChecker.patch
Log Message:
* Mon Dec 3 2007 Lillian Angel <langel at redhat.com> - 3.0.3.4-1
- Upgrade to 3.0.3.4.
- ExcludeArch ppc and ppc64 because of IcedTea.
- Resolves: rhbz#376111
- Resolves: rhbz#321581
- Resolves: rhbz#371521
- Resolves: rhbz#372931
- Resolves: rhbz#235751
- Resolves: rhbz#247295
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 29 Mar 2007 22:47:34 -0000 1.11
+++ .cvsignore 3 Dec 2007 17:03:21 -0000 1.12
@@ -1,3 +1,3 @@
-azureus2-2.5.0.4.tar.gz
-azplugins_1.9.jar
+azureus3-3.0.3.4.tar.gz
bdcc_2.2.2.zip
+azplugins_1.9.jar
azureus-fix-menu-MainMenu.patch:
Index: azureus-fix-menu-MainMenu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-fix-menu-MainMenu.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- azureus-fix-menu-MainMenu.patch 29 Mar 2007 20:39:35 -0000 1.2
+++ azureus-fix-menu-MainMenu.patch 3 Dec 2007 17:03:21 -0000 1.3
@@ -1,6 +1,6 @@
---- 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 @@
+--- ../azureus3orig/azureus3/org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2007-12-03 10:07:11.000000000 -0500
++++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2007-12-03 10:41:18.000000000 -0500
+@@ -229,21 +229,10 @@
addCloseDetailsMenuItem(fileMenu);
addCloseDownloadBarsToMenu(fileMenu);
@@ -22,38 +22,29 @@
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");
-@@ -381,26 +370,6 @@
- menu_plugin_logViews.setMenu(pluginLogsMenu);
- menu_plugin_logViews.setData("EOL", "1");
-
-- new MenuItem(pluginMenu, SWT.SEPARATOR);
--
-- MenuItem plugins_install_wizard = new MenuItem(pluginMenu, SWT.NULL);
-- KeyBindings.setAccelerator(plugins_install_wizard, "MainWindow.menu.plugins.installPlugins");
-- Messages.setLanguageText(plugins_install_wizard, "MainWindow.menu.plugins.installPlugins"); //$NON-NLS-1$
-- plugins_install_wizard.addListener(SWT.Selection, new Listener() {
-- public void handleEvent(Event e) {
-- new InstallPluginWizard(core, display);
-- }
-- });
--
-- MenuItem plugins_uninstall_wizard = new MenuItem(pluginMenu, SWT.NULL);
-- KeyBindings.setAccelerator(plugins_uninstall_wizard, "MainWindow.menu.plugins.uninstallPlugins");
-- Messages.setLanguageText(plugins_uninstall_wizard, "MainWindow.menu.plugins.uninstallPlugins"); //$NON-NLS-1$
-- plugins_uninstall_wizard.addListener(SWT.Selection, new Listener() {
-- public void handleEvent(Event e) {
-- new UnInstallPluginWizard(core, display);
-- }
-- });
+@@ -399,18 +388,6 @@
+ if(isModal) {performOneTimeDisable(menu_tools, true);}
+ }
+
+- //the Plugins menu
+- menu_plugin = new MenuItem(menuBar, SWT.CASCADE);
+- Messages.setLanguageText(menu_plugin, "MainWindow.menu.view.plugins"); //$NON-NLS-1$
+- Menu pluginMenu = new Menu(parent,SWT.DROP_DOWN);
+- menu_plugin.setMenu(pluginMenu);
+- if(isModal) {performOneTimeDisable(menu_plugin, true);}
+- MenuBuildUtils.addMaintenanceListenerForMenu(pluginMenu, new MenuBuildUtils.MenuBuilder() {
+- public void buildMenu(Menu menu) {
+- buildPluginMenu(parent, menu, notMainWindow);
+- }
+- });
-
// standard items
if(Constants.isOSX) {
// Window menu
-@@ -478,49 +447,8 @@
- }
+@@ -489,56 +466,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() {
@@ -75,7 +66,7 @@
- if (uiFunctions != null) {
- uiFunctions.bringToFront();
- }
-- UpdateMonitor.getSingleton(core).performCheck(true, false, new UpdateCheckInstanceListener() {
+- UpdateMonitor.getSingleton(core).performCheck(true, false, false, new UpdateCheckInstanceListener() {
- public void cancelled(UpdateCheckInstance instance) {
- }
-
@@ -95,7 +86,51 @@
- });
- }
-
+- MenuItem help_donate = new MenuItem(helpMenu, SWT.NULL);
+- Messages.setLanguageText(help_donate, "MainWindow.menu.help.donate");
+- help_donate.addListener(SWT.Selection, new Listener() {
+- public void handleEvent(Event e) {
+- new OldDonationWindow(display).show();
+- }
+- });
+-
- 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() {
+@@ -646,35 +575,6 @@
+ this.plugin_view_mon.exit();
+ }
+
+- new MenuItem(pluginMenu, SWT.SEPARATOR);
+-
+- org.gudy.azureus2.plugins.ui.menus.MenuItem[] plugin_items;
+- plugin_items = MenuItemManager.getInstance().getAllAsArray("mainmenu");
+- if (plugin_items.length > 0) {
+- MenuBuildUtils.addPluginMenuItems(parent, plugin_items, pluginMenu, true, true,
+- MenuBuildUtils.BASIC_MENU_ITEM_CONTROLLER
+- );
+- new MenuItem(pluginMenu, SWT.SEPARATOR);
+- }
+-
+- MenuItem plugins_install_wizard = new MenuItem(pluginMenu, SWT.NULL);
+- KeyBindings.setAccelerator(plugins_install_wizard, "MainWindow.menu.plugins.installPlugins");
+- Messages.setLanguageText(plugins_install_wizard, "MainWindow.menu.plugins.installPlugins"); //$NON-NLS-1$
+- plugins_install_wizard.addListener(SWT.Selection, new Listener() {
+- public void handleEvent(Event e) {
+- new InstallPluginWizard(core, display);
+- }
+- });
+-
+- MenuItem plugins_uninstall_wizard = new MenuItem(pluginMenu, SWT.NULL);
+- KeyBindings.setAccelerator(plugins_uninstall_wizard, "MainWindow.menu.plugins.uninstallPlugins");
+- Messages.setLanguageText(plugins_uninstall_wizard, "MainWindow.menu.plugins.uninstallPlugins"); //$NON-NLS-1$
+- plugins_uninstall_wizard.addListener(SWT.Selection, new Listener() {
+- public void handleEvent(Event e) {
+- new UnInstallPluginWizard(core, display);
+- }
+- });
+-
+ }
+
+ private void addDebugMenu(Menu menu) {
azureus-no-update-manager-CoreUpdateChecker.patch:
Index: azureus-no-update-manager-CoreUpdateChecker.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-no-update-manager-CoreUpdateChecker.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- azureus-no-update-manager-CoreUpdateChecker.patch 29 Mar 2007 20:39:35 -0000 1.4
+++ azureus-no-update-manager-CoreUpdateChecker.patch 3 Dec 2007 17:03:21 -0000 1.5
@@ -1,6 +1,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 @@
+--- ../azureus3orig/azureus3/org/gudy/azureus2/update/CoreUpdateChecker.java 2007-12-03 10:07:11.000000000 -0500
++++ org/gudy/azureus2/update/CoreUpdateChecker.java 2007-12-03 10:30:37.000000000 -0500
+@@ -124,8 +124,6 @@
props.setProperty( "plugin.version", plugin_interface.getAzureusVersion());
rdf = plugin_interface.getUtilities().getResourceDownloaderFactory();
@@ -9,7 +9,7 @@
}
public String
-@@ -142,235 +140,9 @@
+@@ -144,302 +142,10 @@
checkForUpdate(
final UpdateChecker checker )
{
@@ -196,6 +196,66 @@
- }
- }
-
+- byte[] info_url_bytes = (byte[])decoded.get("info_url");
+-
+- String info_url = null;
+-
+- if ( info_url_bytes != null ){
+-
+- try{
+- info_url = new String( info_url_bytes );
+-
+- }catch( Exception e ){
+-
+- Debug.out(e);
+- }
+- }
+-
+- if ( info != null || info_url != null ){
+-
+- String check;
+-
+- if ( info == null ){
+-
+- check = info_url;
+-
+- }else if ( info_url == null ){
+-
+- check = info;
+-
+- }else{
+-
+- check = info + "|" + info_url;
+- }
+-
+- byte[] sig = (byte[])decoded.get( "info_sig" );
+-
+- boolean ok = false;
+-
+- if ( sig == null ){
+-
+- Logger.log( new LogEvent( LogIDs.LOGGER, "info signature check failed - missing signature" ));
+-
+- }else{
+-
+- try{
+- AEVerifier.verifyData( check, sig );
+-
+- ok = true;
+-
+- }catch( Throwable e ){
+-
+- Logger.log( new LogEvent( LogIDs.LOGGER, "info signature check failed", e ));
+- }
+- }
+-
+- if ( !ok ){
+-
+- info = null;
+- info_url = null;
+- }
+- }
+-
- String[] desc;
-
- if ( info == null ){
@@ -207,6 +267,8 @@
- desc = new String[]{"Core Azureus Version", info };
- }
-
+-
+-
- final Update update =
- checker.addUpdate(
- "Core Azureus Version",
@@ -215,6 +277,11 @@
- top_downloader,
- Update.RESTART_REQUIRED_YES );
-
+- if ( info_url != null ){
+-
+- update.setDescriptionURL(info_url);
+- }
+-
- top_downloader.addListener(
- new ResourceDownloaderAdapter()
- {
@@ -237,7 +304,7 @@
- checker.failed();
-
- }finally{
--
+
checker.completed();
first_check = false;
azureus-no-update-manager-PluginInstallerImpl.patch:
Index: azureus-no-update-manager-PluginInstallerImpl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-no-update-manager-PluginInstallerImpl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- azureus-no-update-manager-PluginInstallerImpl.patch 29 Mar 2007 20:39:35 -0000 1.2
+++ azureus-no-update-manager-PluginInstallerImpl.patch 3 Dec 2007 17:03:21 -0000 1.3
@@ -1,5 +1,5 @@
---- 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
+--- ../azureus3orig/azureus3/org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java 2007-12-03 10:07:11.000000000 -0500
++++ org/gudy/azureus2/pluginsimpl/local/installer/PluginInstallerImpl.java 2007-12-03 10:32:17.000000000 -0500
@@ -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++){
-@@ -251,23 +244,6 @@
+@@ -254,23 +247,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 );
-@@ -275,12 +251,8 @@
+@@ -278,12 +254,8 @@
}
}
@@ -51,11 +51,10 @@
if ( e instanceof PluginException ){
throw((PluginException)e);
-@@ -343,137 +315,6 @@
- throw( new PluginException( "Plugin '" + pi.getPluginID() + "' is not loaded from the file system, can't uninstall" ));
+@@ -347,138 +319,6 @@
}
}
--
+
- try{
- UpdateManager uman = manager.getDefaultPluginInterface().getUpdateManager();
-
@@ -121,6 +120,8 @@
- Logger.log(new LogAlert(LogAlert.REPEATABLE,
- "Plugin uninstall failed", e));
- }
+-
+- // don't close the stream as we process it later
-
- return( true );
- }
azureus-no-update-manager-SWTUpdateChecker.patch:
Index: azureus-no-update-manager-SWTUpdateChecker.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-no-update-manager-SWTUpdateChecker.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- azureus-no-update-manager-SWTUpdateChecker.patch 29 Mar 2007 20:39:35 -0000 1.4
+++ azureus-no-update-manager-SWTUpdateChecker.patch 3 Dec 2007 17:03:21 -0000 1.5
@@ -1,6 +1,6 @@
---- 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 @@
+--- ../azureus3orig/azureus3/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2007-12-03 10:07:11.000000000 -0500
++++ org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2007-12-03 10:33:55.000000000 -0500
+@@ -71,173 +71,6 @@
}
public void checkForUpdate(final UpdateChecker checker) {
@@ -148,7 +148,9 @@
- "" + versionGetter.getLatestVersion(),
- swtDownloader,
- Update.RESTART_REQUIRED_YES
-- );
+- );
+-
+- update.setDescriptionURL(versionGetter.getInfoURL());
-
- swtDownloader.addListener(new ResourceDownloaderAdapter() {
-
@@ -165,12 +167,10 @@
- checker.failed();
-
- }finally{
-
- checker.completed();
+-
+- checker.completed();
- }
-
}
-+
private boolean
- processData(
azureus-no-update-manager-UpdateMonitor.patch:
Index: azureus-no-update-manager-UpdateMonitor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-no-update-manager-UpdateMonitor.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- azureus-no-update-manager-UpdateMonitor.patch 29 Mar 2007 20:39:35 -0000 1.5
+++ azureus-no-update-manager-UpdateMonitor.patch 3 Dec 2007 17:03:21 -0000 1.6
@@ -1,226 +1,193 @@
---- 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;
-
-- UpdateManager um = azureus_core.getPluginManager().getDefaultPluginInterface().getUpdateManager();
--
-- um.addListener(
-- new UpdateManagerListener()
-- {
-- public void
-- checkInstanceCreated(
-- UpdateCheckInstance instance )
-- {
-- instance.addListener( UpdateMonitor.this );
-- }
-- });
--
-- um.addVerificationListener(
-- new UpdateManagerVerificationListener()
-- {
-- public boolean
-- acceptUnVerifiedUpdate(
-- final Update update )
-- {
-- final boolean accept[] = {false};
--
-- Utils.execSWTThread(
-- new Runnable()
-- {
-- public void
-- run()
-- {
-- accept[0] = MessageBoxWindow.open(
-- "UpdateMonitor.messagebox.accept.unverified",
-- SWT.YES | SWT.NO,
-- SWT.NULL,
-- false,
-- SWTThread.getInstance().getDisplay(),
-- MessageBoxWindow.ICON_WARNING,
-- MessageText.getString( "UpdateMonitor.messagebox.accept.unverified.title" ),
-- MessageText.getString(
-- "UpdateMonitor.messagebox.accept.unverified.text",
-- new String[]{ update.getName()})) == SWT.YES;
--
-- }
-- },
-- false );
--
-- return( accept[0] );
-- }
--
-- public void
-- verificationFailed(
-- final Update update,
-- final Throwable cause )
-- {
-- final String cause_str = Debug.getNestedExceptionMessage( cause );
--
-- Utils.execSWTThread(
-- new Runnable()
-- {
-- public void
-- run()
-- {
-- Utils.openMessageBox(Utils.findAnyShell(),
-- SWT.OK,
-- "UpdateMonitor.messagebox.verification.failed",
-- new String[]{ update.getName(), cause_str });
-- }
-- });
-- }
-- });
--
-- SimpleTimer.addPeriodicEvent(
-- "UpdateMon:autocheck",
-- AUTO_UPDATE_CHECK_PERIOD,
-- new TimerEventPerformer()
-- {
-- public void
-- perform(
-- TimerEvent ev )
-- {
-- performAutoCheck(false);
-- }
-- });
--
-- // wait a bit before starting check to give rest of AZ time to initialise
--
-- new DelayedEvent(
-- "UpdateMon:wait",
-- 2500,
-- new AERunnable()
-- {
-- public void
-- runSupport()
-- {
-- performAutoCheck(true);
+--- ../azureus3orig/azureus3/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2007-12-03 10:07:11.000000000 -0500
++++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2007-12-03 10:35:51.000000000 -0500
+@@ -84,67 +84,6 @@
+ protected UpdateMonitor(AzureusCore _azureus_core) {
+ azCore = _azureus_core;
+
+- PluginInterface defPI = azCore.getPluginManager().getDefaultPluginInterface();
+- UpdateManager um = defPI.getUpdateManager();
+-
+- um.addListener(new UpdateManagerListener() {
+- public void checkInstanceCreated(UpdateCheckInstance instance) {
+- instance.addListener(UpdateMonitor.this);
+- }
+- });
+-
+- um.addVerificationListener(new UpdateManagerVerificationListener() {
+- public boolean acceptUnVerifiedUpdate(final Update update) {
+- UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
+- if (uiFunctions != null) {
+- String title = MessageText.getString(MSG_PREFIX
+- + "accept.unverified.title");
+- String text = MessageText.getString(MSG_PREFIX
+- + "accept.unverified.text", new String[] {
+- update.getName()
+- });
+- return uiFunctions.promptUser(title, text, new String[] {
+- MessageText.getString("Button.yes"),
+- MessageText.getString("Button.no")
+- }, 1, MSG_PREFIX + "accept.unverified",
+- MessageText.getString("MessageBoxWindow.nomoreprompting"), false,
+- 0) == 0;
+- }
+-
+- return false;
+- }
+-
+- public void verificationFailed(final Update update, final Throwable cause) {
+- final String cause_str = Debug.getNestedExceptionMessage(cause);
+- UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
+- if (uiFunctions != null) {
+- String title = MessageText.getString(MSG_PREFIX
+- + "verification.failed.title");
+- String text = MessageText.getString(MSG_PREFIX
+- + "verification.failed.text", new String[] {
+- update.getName(),
+- cause_str
+- });
+- uiFunctions.promptUser(title, text, new String[] {
+- MessageText.getString("Button.ok")
+- }, 0, null, null, false, 0);
+- }
+- }
+- });
+-
+- SimpleTimer.addPeriodicEvent("UpdateMon:autocheck",
+- AUTO_UPDATE_CHECK_PERIOD, new TimerEventPerformer() {
+- public void perform(TimerEvent ev) {
+- performAutoCheck(false);
- }
- });
+-
+- // wait a bit before starting check to give rest of AZ time to initialise
+- new DelayedEvent("UpdateMon:wait", 2500, new AERunnable() {
+- public void runSupport() {
+- performAutoCheck(true);
+- }
+- });
}
-
- protected void
- performAutoCheck(
- final boolean start_of_day )
- {
-- boolean check_at_start = false;
-- boolean check_periodic = false;
+
+ protected void requestRecheck()
+@@ -157,43 +96,6 @@
+ }
+
+ protected void performAutoCheck(final boolean start_of_day) {
+- boolean check_at_start = false;
+- boolean check_periodic = false;
- boolean bOldSWT = SWT.getVersion() < 3139;
--
-- // no update checks for java web start
--
-- if ( !SystemProperties.isJavaWebStartInstance()){
--
+-
+- // no update checks for java web start
+-
+- if (!SystemProperties.isJavaWebStartInstance()) {
+-
- // force check when SWT is really old
-- check_at_start = COConfigurationManager.getBooleanParameter( "update.start", true ) || bOldSWT;
-- check_periodic = COConfigurationManager.getBooleanParameter( "update.periodic", true );
+- check_at_start = COConfigurationManager.getBooleanParameter("update.start")
+- || bOldSWT;
+- check_periodic = COConfigurationManager.getBooleanParameter("update.periodic");
- }
--
-- // periodic -> check at start as well
--
+-
+- // periodic -> check at start as well
+-
- check_at_start = check_at_start || check_periodic;
--
-- if ( ( check_at_start && start_of_day) ||
-- ( check_periodic && !start_of_day )){
--
-- performCheck(bOldSWT, true, null); // this will implicitly do usage stats
--
-- }else{
-
-- new DelayedEvent(
-- "UpdateMon:wait2",
-- 5000,
-- new AERunnable()
-- {
-- public void
-- runSupport()
-- {
-- if ( start_of_day ){
-- UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
-- if (uiFunctions != null) {
-- uiFunctions.setStatusText("");
-- }
-- }
+- if ((check_at_start && start_of_day) || (check_periodic && !start_of_day)) {
+-
+- performCheck(bOldSWT, true, false, null ); // this will implicitly do usage stats
-
-- CoreUpdateChecker.doUsageStats();
+- } else {
+-
+- new DelayedEvent("UpdateMon:wait2", 5000, new AERunnable() {
+- public void runSupport() {
+- if (start_of_day) {
+- UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
+- if (uiFunctions != null) {
+- uiFunctions.setStatusText("");
- }
-- });
+- }
+-
+- CoreUpdateChecker.doUsageStats();
+- }
+- });
- }
}
- public void
-@@ -242,72 +104,7 @@
- final boolean automatic,
- final UpdateCheckInstanceListener l )
+ public void
+@@ -203,78 +105,6 @@
+ final boolean isRecheck,
+ final UpdateCheckInstanceListener l )
{
-- if ( SystemProperties.isJavaWebStartInstance()){
+- long now = SystemTime.getCurrentTime();
+-
+- if ( isRecheck ){
-
-- // just in case we get here somehome!
+- if ( last_recheck_time > now || now - last_recheck_time < 23*60*60*1000 ){
+-
+- if (Logger.isEnabled())
+- Logger.log(new LogEvent(LOGID,
+- "skipping recheck as consecutive recheck too soon"));
+-
+- return;
+- }
+-
+- last_recheck_time = now;
+-
+- }else{
+-
+- last_recheck_time = 0;
+- }
+-
+- if (SystemProperties.isJavaWebStartInstance()) {
+-
+- // just in case we get here somehome!
- if (Logger.isEnabled())
- Logger.log(new LogEvent(LOGID,
- "skipping update check as java web start"));
--
+-
- return;
- }
-
-- // kill any existing update window
--
-- if ( current_update_window != null && ! current_update_window.isDisposed()){
--
-- SWTThread.getInstance().getDisplay().syncExec(
-- new AERunnable()
-- {
-- public void
-- runSupport()
-- {
-- current_update_window.dispose();
-- }
-- });
-- }
--
-- if ( current_update_instance != null ){
--
-- current_update_instance.cancel();
-- }
--
-- UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
-- if (uiFunctions != null) {
-- // XXX What kind of format is this!?
-- uiFunctions.setStatusText("MainWindow.status.checking ...");
-- }
--
-- // take this off this GUI thread in case it blocks for a while
--
-- AEThread t =
-- new AEThread( "UpdateMonitor:kickoff")
-- {
-- public void
-- runSupport()
-- {
-- UpdateManager um = azureus_core.getPluginManager().getDefaultPluginInterface().getUpdateManager();
--
-- current_update_instance =
-- um.createUpdateCheckInstance(
-- 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();
-- }
-- };
--
-- t.setDaemon( true );
--
+-
+- // kill any existing update window
+-
+- if (current_update_window != null && !current_update_window.isDisposed()) {
+- current_update_window.dispose();
+- }
+-
+- if (current_update_instance != null) {
+-
+- current_update_instance.cancel();
+- }
+-
+- UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
+- if (uiFunctions != null) {
+- // XXX What kind of format is this!?
+- uiFunctions.setStatusText("MainWindow.status.checking ...");
+- }
+-
+- // take this off this GUI thread in case it blocks for a while
+-
+- AEThread t = new AEThread("UpdateMonitor:kickoff") {
+- public void runSupport() {
+- UpdateManager um = azCore.getPluginManager().getDefaultPluginInterface().getUpdateManager();
+-
+- current_update_instance = um.createUpdateCheckInstance(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();
+- }
+- };
+-
+- t.setDaemon(true);
+-
- t.start();
}
-
- public void
+
+ public void complete(UpdateCheckInstance instance) {
azureus-no-updates-PluginInitializer.patch:
Index: azureus-no-updates-PluginInitializer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-no-updates-PluginInitializer.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- azureus-no-updates-PluginInitializer.patch 30 Jul 2006 18:56:22 -0000 1.2
+++ azureus-no-updates-PluginInitializer.patch 3 Dec 2007 17:03:21 -0000 1.3
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java.orig 2006-07-02 21:17:53.000000000 -0700
-+++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java 2006-07-02 21:19:27.000000000 -0700
-@@ -49,13 +49,8 @@
+--- ../azureus3orig/azureus3/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java 2007-12-03 10:07:11.000000000 -0500
++++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java 2007-12-03 10:27:39.000000000 -0500
+@@ -44,13 +44,8 @@
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 @@
/**
* @author Olivier
-@@ -96,11 +91,6 @@
+@@ -91,11 +86,6 @@
"azbpsharehoster",
"ShareHoster",
"true" },
@@ -26,7 +26,7 @@
{ PluginManagerDefaults.PID_CLIENT_ID,
"com.aelitis.azureus.plugins.clientid.ClientIDPlugin",
"azbpclientid",
-@@ -126,16 +116,6 @@
+@@ -121,16 +111,6 @@
"azbpmagnet",
"Magnet URI Handler",
"true" },
@@ -40,22 +40,22 @@
- "azbpcorepatcher",
- "CorePatcher",
- "true" },
- //{ PluginManagerDefaults.PID_JPC,
- // "com.aelitis.azureus.plugins.jpc.JPCPlugin",
- // "azjpc",
-@@ -302,11 +282,7 @@
+ { PluginManagerDefaults.PID_PLATFORM_CHECKER,
+ "org.gudy.azureus2.platform.PlatformManagerPluginDelegate",
+ "azplatform2",
+@@ -316,11 +296,7 @@
- listener = _listener;
+ core_operation = _core_operation;
- UpdateManagerImpl.getSingleton( azureus_core ); // initialise the update manager
-
plugin_manager = PluginManagerImpl.getSingleton( this );
-
-- UpdaterUtils.checkPlugin();
+- UpdaterUtils.checkBootstrapPlugins();
}
- public List
-@@ -901,16 +877,11 @@
+ protected boolean
+@@ -946,16 +922,11 @@
if ( load_failure != null ){
azureus-remove-win32-osx-platforms.patch:
Index: azureus-remove-win32-osx-platforms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-remove-win32-osx-platforms.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- azureus-remove-win32-osx-platforms.patch 29 Mar 2007 20:39:35 -0000 1.3
+++ azureus-remove-win32-osx-platforms.patch 3 Dec 2007 17:03:21 -0000 1.4
@@ -38,3 +38,209 @@
return( platform_manager );
+--- om/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java 2007-12-03 10:07:10.000000000 -0500
++++ com/aelitis/azureus/core/update/impl/AzureusRestarterImpl.java 2007-12-03 11:07:16.000000000 -0500
+@@ -30,8 +30,6 @@
+ import org.gudy.azureus2.platform.PlatformManager;
+ import org.gudy.azureus2.platform.PlatformManagerFactory;
+ import org.gudy.azureus2.platform.unix.ScriptAfterShutdown;
+-import org.gudy.azureus2.platform.win32.access.AEWin32Access;
+-import org.gudy.azureus2.platform.win32.access.AEWin32Manager;
+ import org.gudy.azureus2.update.UpdaterUtils;
+
+ import com.aelitis.azureus.core.AzureusCore;
+@@ -214,28 +212,6 @@
+ }
+
+
+- private boolean
+- win32NativeRestart(
+- PrintWriter log,
+- String exec )
+- {
+- try{
+- // we need to spawn without inheriting handles
+-
+- PlatformManager pm = PlatformManagerFactory.getPlatformManager();
+-
+- pm.createProcess( exec, false );
+-
+- return( true );
+-
+- }catch(Throwable e) {
+- e.printStackTrace(log);
+-
+- return( false );
+- }
+- }
+-
+-
+ private String getExeUpdater(PrintWriter log) {
+ try {
+ boolean isVistaOrHigher = false;
+@@ -317,44 +293,7 @@
+
+ try {
+ int result;
+- AEWin32Access accessor = AEWin32Manager.getAccessor(true);
+- if (accessor == null) {
+ result = -123;
+- } else {
+- if (azRunner != null) {
+- // create a batch file to run the updater, then to restart azureus
+- // bceause the updater would restart azureus as administrator user
+- // and confuse the user
+- fileRestart = FileUtil.getUserFile("restart.bat");
+- String s = "title Azureus Updater Runner\r\n";
+- s += exeUpdater + " \"updateonly\"";
+- for (int i = 1; i < parameters.length; i++) {
+- s += " \"" + parameters[i].replaceAll("\\\"", "") + "\"";
+- }
+- s += "\r\n";
+- s += "start \"\" \"" + azRunner + "\"";
+- FileUtil.writeBytesAsFile(fileRestart.getAbsolutePath(), s.getBytes());
+-
+- result = accessor.shellExecute(null, fileRestart.getAbsolutePath(),
+- null, SystemProperties.getApplicationPath(),
+- AEWin32Access.SW_SHOWMINIMIZED);
+- } else {
+- String execEXE = "\"-J" + getClassPath().replaceAll("\\\"", "")
+- + "\" ";
+-
+- for (int i = 0; i < properties.length; i++) {
+- execEXE += "\"-J" + properties[i].replaceAll("\\\"", "") + "\" ";
+- }
+-
+- for (int i = 0; i < parameters.length; i++) {
+- execEXE += " \"" + parameters[i].replaceAll("\\\"", "") + "\"";
+- }
+-
+- log.println("Launch via " + exeUpdater + " params " + execEXE);
+- result = accessor.shellExecute(null, exeUpdater, execEXE,
+- SystemProperties.getApplicationPath(), AEWin32Access.SW_NORMAL);
+- }
+- }
+
+ /*
+ * Some results:
+@@ -446,59 +385,9 @@
+ String[] parameters,
+ boolean update_only)
+ {
+- if(Constants.isOSX){
+-
+- restartAzureus_OSX(log,mainClass,properties,parameters);
+-
+- }else if( Constants.isUnix ){
+-
+ restartAzureus_Unix(log,mainClass,properties,parameters);
+-
+- }else{
+-
+- restartAzureus_win32(log,mainClass,properties,parameters,update_only);
+- }
+ }
+
+- private void
+- restartAzureus_win32(
+- PrintWriter log,
+- String mainClass,
+- String[] properties,
+- String[] parameters,
+- boolean update_only)
+- {
+- String exeUpdater = getExeUpdater(log); // Not for Updater.java
+-
+- String exec;
+-
+- //Classic restart way using Runtime.exec directly on java(w)
+- exec = "\"" + JAVA_EXEC_DIR + "javaw\" " + getClassPath() + getLibraryPath();
+-
+- for (int i = 0; i < properties.length; i++) {
+- exec += properties[i] + " ";
+- }
+-
+- exec += mainClass;
+-
+- for (int i = 0; i < parameters.length; i++) {
+- exec += " \"" + parameters[i] + "\"";
+- }
+-
+- if (exeUpdater != null) {
+- restartViaEXE(log, exeUpdater, properties, parameters, exec, update_only);
+- } else {
+- if (log != null) {
+- log.println(" " + exec);
+- }
+-
+- if (!win32NativeRestart(log, exec)) {
+- javaSpawn(log, exec);
+- }
+- }
+- }
+-
+-
+ private boolean
+ javaSpawn(
+ PrintWriter log,
+--- om/aelitis/azureus/ui/swt/views/skin/TorrentListViewsUtils.java 2007-12-03 10:07:11.000000000 -0500
++++ com/aelitis/azureus/ui/swt/views/skin/TorrentListViewsUtils.java 2007-12-03 11:12:15.000000000 -0500
+@@ -64,7 +64,6 @@
+ import com.aelitis.azureus.ui.swt.views.TorrentListViewListener;
+ import com.aelitis.azureus.util.AdManager;
+ import com.aelitis.azureus.util.Constants;
+-import com.aelitis.azureus.util.win32.Win32Utils;
+
+ import org.gudy.azureus2.plugins.PluginInterface;
+ import org.gudy.azureus2.plugins.PluginManager;
+@@ -602,17 +601,6 @@
+ * @param string
+ */
+ private static boolean runInMediaPlayer(String mediaFile) {
+- if (Constants.isWindows) {
+- String wmpEXE = Win32Utils.getWMP();
+- if (new File(wmpEXE).exists()) {
+- try {
+- Runtime.getRuntime().exec(wmpEXE + " \"" + mediaFile + "\"");
+- return true;
+- } catch (IOException e) {
+- Debug.out("error playing " + mediaFile + " via WMP " + mediaFile, e);
+- }
+- }
+- }
+ return false;
+ }
+
+--- rg/gudy/azureus2/platform/PlatformManagerPluginDelegate.java 2007-12-03 10:07:11.000000000 -0500
++++ org/gudy/azureus2/platform/PlatformManagerPluginDelegate.java 2007-12-03 11:19:38.000000000 -0500
+@@ -23,7 +23,6 @@
+ import java.util.Properties;
+
+ import org.gudy.azureus2.platform.unix.PlatformManagerUnixPlugin;
+-import org.gudy.azureus2.platform.win32.PlatformManagerUpdateChecker;
+
+ import org.gudy.azureus2.plugins.Plugin;
+ import org.gudy.azureus2.plugins.PluginException;
+@@ -42,22 +41,8 @@
+ // @see org.gudy.azureus2.plugins.Plugin#initialize(org.gudy.azureus2.plugins.PluginInterface)
+ public void initialize(PluginInterface pluginInterface)
+ throws PluginException {
+- PlatformManager platform = PlatformManagerFactory.getPlatformManager();
+-
+- int platformType = platform.getPlatformType();
+- if (platformType == PlatformManager.PT_WINDOWS) {
+- PlatformManagerUpdateChecker plugin = new PlatformManagerUpdateChecker();
+- plugin.initialize(pluginInterface);
+- } else if (platformType == PlatformManager.PT_UNIX) {
+ PlatformManagerUnixPlugin plugin = new PlatformManagerUnixPlugin();
+ plugin.initialize(pluginInterface);
+- } else {
+- Properties pluginProperties = pluginInterface.getPluginProperties();
+- pluginProperties.setProperty("plugin.name", "Platform-Specific Support");
+- pluginProperties.setProperty("plugin.version", "1.0");
+- pluginProperties.setProperty("plugin.version.info",
+- "Not required for this platform");
+- }
+ }
+
+ public String
azureus-themed.patch:
Index: azureus-themed.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-themed.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- azureus-themed.patch 29 Mar 2007 20:39:35 -0000 1.6
+++ azureus-themed.patch 3 Dec 2007 17:03:21 -0000 1.7
@@ -1,5 +1,5 @@
---- 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
+--- ../azureus3orig/azureus3/org/gudy/azureus2/ui/swt/ImageRepository.java 2007-12-03 10:07:11.000000000 -0500
++++ org/gudy/azureus2/ui/swt/ImageRepository.java 2007-12-03 10:23:20.000000000 -0500
@@ -67,6 +67,25 @@
addPath("org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash");
}
@@ -26,7 +26,7 @@
public static void loadImages(Display display) {
if(Constants.isOSX) {
-@@ -119,22 +138,22 @@
+@@ -119,23 +138,23 @@
//ToolBar Icons
addPath("org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open");
@@ -46,36 +46,44 @@
- 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("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");
+ addPath("org/gudy/azureus2/ui/icons/toolbar/switchui.png", "cb_switch");
++ 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
addPath("org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok");
-@@ -195,6 +214,16 @@
- Image im = getImage(name,false);
+@@ -198,6 +217,16 @@
if(null == im) {
- InputStream is = loader.getResourceAsStream(res);
-+ if (is == null)
-+ {
-+ try
-+ {
-+ is = new FileInputStream (res);
-+ }
-+ catch (FileNotFoundException fnf)
-+ {
-+ }
-+ }
- if(null != is) {
- try {
- if(alpha == 255) {
+ try{
+ InputStream is = loader.getResourceAsStream(res);
++ if (is == null)
++ {
++ try
++ {
++ is = new FileInputStream (res);
++ }
++ catch (FileNotFoundException fnf)
++ {
++ }
++ }
+ if(null != is) {
+ try {
+ if(alpha == 255) {
+@@ -629,4 +658,4 @@
+ }
+ }
+ }
+-}
+\ No newline at end of file
++}
Index: azureus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- azureus.spec 25 Oct 2007 23:36:11 -0000 1.46
+++ azureus.spec 3 Dec 2007 17:03:21 -0000 1.47
@@ -1,8 +1,8 @@
# ExclusiveArch: %{ix86} x86_64
Name: azureus
-Version: 2.5.0.4
-Release: 4%{?dist}
+Version: 3.0.3.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.4.tar.gz
+Source0: azureus3-3.0.3.4.tar.gz
Source1: azureus.script
Source2: Azureus.desktop
@@ -22,7 +22,6 @@
Source6: bdcc_2.2.2.zip
Patch0: azureus-remove-win32-osx-platforms.patch
-Patch1: azureus-remove-win32-PlatformManagerUpdateChecker.patch
Patch2: azureus-cache-size.patch
Patch3: azureus-remove-manifest-classpath.patch
Patch7: azureus-themed.patch
@@ -39,16 +38,12 @@
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
Patch27: azureus-SecureMessageServiceClientHelper-bcprov.patch
-Patch28: azureus-UDPConnectionSet-bcprov.patch
-Patch29: azureus-CryptoHandlerECC-bcprov.patch
-Patch30: azureus-CryptoSTSEngineImpl-bcprov.patch
Patch31: azureus-fix-menu-MainMenu.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ant, jpackage-utils >= 1.5, xml-commons-apis
+BuildRequires: ant, junit, jpackage-utils >= 1.5, xml-commons-apis
BuildRequires: jakarta-commons-cli, log4j
BuildRequires: libgconf-java
BuildRequires: bouncycastle >= 1.33-3
@@ -58,12 +53,16 @@
Requires: libgconf-java
Requires: bouncycastle >= 1.33-3
Requires: libgcj >= 4.1.0-0.15
-BuildRequires: java-gcj-compat-devel >= 1.0.31
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+BuildRequires: java-1.5.0-gcj-devel
+BuildRequires: java-1.7.0-icedtea-devel
+Requires(post): java-1.5.0-gcj
+Requires(postun): java-1.5.0-gcj
+Requires(post): java-1.7.0-icedtea
+Requires(postun): java-1.7.0-icedtea
BuildRequires: desktop-file-utils
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
+ExcludeArch: ppc ppc64
%description
Azureus implements the BitTorrent protocol using java language and
@@ -71,15 +70,13 @@
advanced users.
%prep
-%setup -q -n %{name}2
+%setup -q -n %{name}3
%patch0 -p0
-%patch1 -p0
%patch2 -p0
%patch3 -p0
%patch7 -p0
%patch8 -p0
%patch9 -p0
-#%patch11 -p0
%patch12 -p0
%patch13 -p0
%patch14 -p0
@@ -91,15 +88,12 @@
%patch22 -p0
%patch23 -p0
%patch25 -p0
-#%patch26 -p0
%patch27 -p0
-#%patch28 -p0
-#%patch29 -p0
-#%patch30 -p0
%patch31 -p0
cp %{SOURCE4} License.txt
%build
+export JAVA_HOME=/usr/lib/jvm/java-icedtea/
mkdir -p build/libs
build-jar-repository -p build/libs bcprov jakarta-commons-cli log4j gtk2.8 glib0.2
ln -s %{_libdir}/eclipse/swt-gtk-3.3.jar build/libs
@@ -113,22 +107,26 @@
ant jar
mkdir -p plugins/azplugins
-cd plugins/azplugins
+pushd plugins
+pushd azplugins
unzip -q %{SOURCE5}
rm -f *.jar `find ./ -name \*class`
find ./ -name \*java | xargs javac -cp %{_libdir}/eclipse/swt-gtk-3.3.jar:../..:.
find ./ -name \*java | xargs rm
jar cvf azplugins_1.9.jar .
-cd ../..
+popd
+popd
unzip -q %{SOURCE6}
-cd plugins/bdcc
+pushd plugins
+pushd bdcc
unzip *.jar
rm -f *.jar `find ./ -name \*class`
find ./ -name \*java | xargs javac -cp %{_libdir}/eclipse/swt-gtk-3.3.jar:../..:.
find ./ -name \*java | xargs rm
jar cvf bdcc_2.2.2.jar .
-cd ../..
+popd
+popd
%install
rm -rf $RPM_BUILD_ROOT
@@ -207,6 +205,16 @@
%{_libdir}/gcj/*
%changelog
+* Mon Dec 3 2007 Lillian Angel <langel at redhat.com> - 3.0.3.4-1
+- Upgrade to 3.0.3.4.
+- ExcludeArch ppc and ppc64 because of IcedTea.
+- Resolves: rhbz#376111
+- Resolves: rhbz#321581
+- Resolves: rhbz#371521
+- Resolves: rhbz#372931
+- Resolves: rhbz#235751
+- Resolves: rhbz#247295
+
* Thu Oct 25 2007 Ben Konrath <bkonrath at redhat.com> - 2.5.0.4-4
- Use swt.jar instead of swt-gtk-3.3.jar in wrapper script.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 29 Mar 2007 22:47:34 -0000 1.11
+++ sources 3 Dec 2007 17:03:21 -0000 1.12
@@ -1,3 +1,3 @@
-e0f146acd013c603bf5acc89b7fc7e33 azureus2-2.5.0.4.tar.gz
-7879202464bf4145f7d4848fb5f0e04f azplugins_1.9.jar
+77612fdbb97e62617ad1f6802a39d02d azureus3-3.0.3.4.tar.gz
0e88c3952b36ba221e277420a7080b43 bdcc_2.2.2.zip
+7879202464bf4145f7d4848fb5f0e04f azplugins_1.9.jar
--- azureus-CryptoHandlerECC-bcprov.patch DELETED ---
--- azureus-CryptoSTSEngineImpl-bcprov.patch DELETED ---
--- azureus-UDPConnectionSet-bcprov.patch DELETED ---
--- azureus-nativetabs.patch DELETED ---
--- azureus-remove-win32-PlatformManagerUpdateChecker.patch DELETED ---
- Previous message (by thread): rpms/postgresql-odbc/F-8 .cvsignore, 1.9, 1.10 postgresql-odbc.spec, 1.21, 1.22 sources, 1.9, 1.10
- Next message (by thread): rpms/libtranslate/F-8 libtranslate-0.99-services.patch, NONE, 1.1 libtranslate-add_Promt_service.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list