rpms/azureus/F-12 .cvsignore, 1.17, 1.18 azureus-4.0.0.4-boo-osx.diff, 1.3, 1.4 azureus-no-update-manager-AzureusCoreImpl.patch, 1.2, 1.3 azureus-no-update-manager-CoreUpdateChecker.patch, 1.6, 1.7 azureus-no-update-manager-UpdateMonitor.patch, 1.8, 1.9 azureus.spec, 1.80, 1.81 sources, 1.17, 1.18
David Juran
djuran at fedoraproject.org
Wed Dec 2 18:10:26 UTC 2009
- Previous message: File 389-ds-base-1.2.5.rc1.tar.bz2 uploaded to lookaside cache by rmeggins
- Next message: rpms/389-ds-base/F-10 .cvsignore, 1.5, 1.6 389-ds-base-git-local.sh, 1.2, 1.3 389-ds-base-git.sh, 1.3, 1.4 389-ds-base.spec, 1.7, 1.8 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: djuran
Update of /cvs/pkgs/rpms/azureus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12201
Modified Files:
.cvsignore azureus-4.0.0.4-boo-osx.diff
azureus-no-update-manager-AzureusCoreImpl.patch
azureus-no-update-manager-CoreUpdateChecker.patch
azureus-no-update-manager-UpdateMonitor.patch azureus.spec
sources
Log Message:
- upgrade to 4.3.0.4 (Bz 540179)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore 13 Sep 2009 08:49:24 -0000 1.17
+++ .cvsignore 2 Dec 2009 18:10:26 -0000 1.18
@@ -1 +1 @@
-Vuze_4.2.0.8_source.zip
+Vuze_4.3.0.4_source.zip
azureus-4.0.0.4-boo-osx.diff:
SWTThread.java | 51 ---------------------------------------------------
1 file changed, 51 deletions(-)
Index: azureus-4.0.0.4-boo-osx.diff
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-12/azureus-4.0.0.4-boo-osx.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- azureus-4.0.0.4-boo-osx.diff 13 Sep 2009 08:49:25 -0000 1.3
+++ azureus-4.0.0.4-boo-osx.diff 2 Dec 2009 18:10:26 -0000 1.4
@@ -1,31 +1,61 @@
-diff -up azureus-4.2.0.4/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java.boo-osx azureus-4.2.0.4/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
---- org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java.boo-osx 2009-04-16 20:46:42.000000000 +0300
-+++ org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java 2009-07-31 19:35:41.000000000 +0300
-@@ -153,25 +153,6 @@ public class SWTThread {
+diff -up azureus-4.3.0.0/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java.boo-osx azureus-4.3.0.0/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
+--- azureus-4.3.0.0/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java.boo-osx 2009-10-30 01:16:06.000000000 +0200
++++ azureus-4.3.0.0/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java 2009-11-19 21:24:45.000000000 +0200
+@@ -175,57 +175,6 @@ public class SWTThread {
}
});
-
-- if ( Constants.isOSX && SWT.getPlatform().equals("carbon") ){
--
-- // use reflection here so we decouple generic SWT from OSX specific stuff to an extent
--
-- try{
--
-- Class ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CarbonUIEnhancer");
--
-- Constructor constructor = ehancerClass.getConstructor(new Class[]{});
--
-- constructor.newInstance(new Object[] {});
--
-- } catch (Exception e) {
--
-- Debug.printStackTrace(e);
-- }
-- }
--
+
+- if (Constants.isOSX) {
+-
+- // On Cocoa, we get a Close trigger on display. Need to check if all
+- // platforms send this.
+- display.addListener(SWT.Close, new Listener() {
+- public void handleEvent(Event event) {
+- event.doit = UIFunctionsManager.getUIFunctions().dispose(false, false);
+- }
+- });
+-
+- String platform = SWT.getPlatform();
+- // use reflection here so we decouple generic SWT from OSX specific stuff to an extent
+-
+- if (platform.equals("carbon")) {
+- try {
+-
+- Class<?> ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CarbonUIEnhancer");
+-
+- Constructor<?> constructor = ehancerClass.getConstructor(new Class[] {});
+-
+- constructor.newInstance(new Object[] {});
+-
+- } catch (Throwable e) {
+-
+- Debug.printStackTrace(e);
+- }
+- } else if (platform.equals("cocoa")) {
+- try {
+-
+- Class<?> ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CocoaUIEnhancer");
+-
+- Method mGetInstance = ehancerClass.getMethod("getInstance", new Class[0]);
+- Object claObj = mGetInstance.invoke(null, new Object[0] );
+-
+- Method mHookAppMenu = claObj.getClass().getMethod("hookApplicationMenu", new Class[] {});
+- if (mHookAppMenu != null) {
+- mHookAppMenu.invoke(claObj, new Object[0]);
+- }
+-
+- Method mHookDocOpen = claObj.getClass().getMethod("hookDocumentOpen", new Class[] {});
+- if (mHookDocOpen != null) {
+- mHookDocOpen.invoke(claObj, new Object[0]);
+- }
+-
+- } catch (Throwable e) {
+-
+- Debug.printStackTrace(e);
+- }
+- }
+- }
-
if (app != null) {
app.runInSWTThread();
runner = new Thread(new AERunnable() {
-diff -up azureus-4.2.0.4/org/gudy/azureus2/ui/swt/osx/Start.java.boo-osx azureus-4.2.0.4/org/gudy/azureus2/ui/swt/osx/Start.java
-diff -up azureus-4.2.0.4/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java.boo-osx azureus-4.2.0.4/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
azureus-no-update-manager-AzureusCoreImpl.patch:
AzureusCoreImpl.java | 8 --------
1 file changed, 8 deletions(-)
Index: azureus-no-update-manager-AzureusCoreImpl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-12/azureus-no-update-manager-AzureusCoreImpl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- azureus-no-update-manager-AzureusCoreImpl.patch 12 May 2006 14:35:02 -0000 1.2
+++ azureus-no-update-manager-AzureusCoreImpl.patch 2 Dec 2009 18:10:26 -0000 1.3
@@ -1,9 +1,11 @@
---- com/aelitis/azureus/core/impl/AzureusCoreImpl.java.orig 2006-03-25 14:17:49.000000000 -0800
-+++ com/aelitis/azureus/core/impl/AzureusCoreImpl.java 2006-03-25 15:14:01.000000000 -0800
-@@ -584,14 +584,6 @@
+diff -up azureus-4.3.0.0/com/aelitis/azureus/core/impl/AzureusCoreImpl.java.no-update-manager-AzureusCoreImpl azureus-4.3.0.0/com/aelitis/azureus/core/impl/AzureusCoreImpl.java
+--- azureus-4.3.0.0/com/aelitis/azureus/core/impl/AzureusCoreImpl.java.no-update-manager-AzureusCoreImpl 2009-11-10 23:07:36.000000000 +0200
++++ azureus-4.3.0.0/com/aelitis/azureus/core/impl/AzureusCoreImpl.java 2009-11-19 21:10:10.000000000 +0200
+@@ -1341,14 +1341,6 @@ AzureusCoreImpl
+
if (Logger.isEnabled())
Logger.log(new LogEvent(LOGID, "Stop operation completes"));
-
+-
- // if any installers exist then we need to closedown via the updater
-
- if ( apply_updates &&
@@ -11,7 +13,6 @@
-
- AzureusRestarterFactory.create( this ).restart( true );
- }
--
- try{
- ThreadGroup tg = Thread.currentThread().getThreadGroup();
-
+
+ try {
+ Class c = Class.forName( "sun.awt.AWTAutoShutdown" );
azureus-no-update-manager-CoreUpdateChecker.patch:
CoreUpdateChecker.java | 304 -------------------------------------------------
1 file changed, 2 insertions(+), 302 deletions(-)
Index: azureus-no-update-manager-CoreUpdateChecker.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-12/azureus-no-update-manager-CoreUpdateChecker.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- azureus-no-update-manager-CoreUpdateChecker.patch 13 Sep 2009 15:36:35 -0000 1.6
+++ azureus-no-update-manager-CoreUpdateChecker.patch 2 Dec 2009 18:10:26 -0000 1.7
@@ -1,6 +1,6 @@
-diff -up azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java
---- azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker 2009-07-07 00:52:10.000000000 +0200
-+++ azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java 2009-09-13 12:41:05.000000000 +0200
+diff -up azureus-4.3.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker azureus-4.3.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java
+--- azureus-4.3.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java.no-update-manager-CoreUpdateChecker 2009-11-04 03:23:06.000000000 +0200
++++ azureus-4.3.0.0/org/gudy/azureus2/update/CoreUpdateChecker.java 2009-11-19 21:15:38.000000000 +0200
@@ -127,8 +127,6 @@ CoreUpdateChecker
props.setProperty( "plugin.version", plugin_interface.getAzureusVersion());
@@ -21,7 +21,7 @@ diff -up azureus-4.2.0.8/org/gudy/azureu
-
- Map decoded = VersionCheckClient.getSingleton().getVersionCheckInfo(
- first_check?VersionCheckClient.REASON_UPDATE_CHECK_START:VersionCheckClient.REASON_UPDATE_CHECK_PERIODIC);
-
+-
-
- displayUserMessage( decoded );
-
@@ -58,7 +58,7 @@ diff -up azureus-4.2.0.8/org/gudy/azureu
- }
-
- //latest_version = "3.0.0.3";
-- //latest_file_name = "http://torrents.aelitis.com:88/torrents/Azureus2.5.0.0.jar.torrent";
+- //latest_file_name = "http://torrent.vuze.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 + "'";
@@ -312,11 +312,13 @@ diff -up azureus-4.2.0.8/org/gudy/azureu
- checker.failed();
-
- }finally{
-
+-
++
checker.completed();
first_check = false;
- }
++
}
azureus-no-update-manager-UpdateMonitor.patch:
UpdateMonitor.java | 170 -----------------------------------------------------
1 file changed, 170 deletions(-)
Index: azureus-no-update-manager-UpdateMonitor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-12/azureus-no-update-manager-UpdateMonitor.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- azureus-no-update-manager-UpdateMonitor.patch 13 Sep 2009 15:36:35 -0000 1.8
+++ azureus-no-update-manager-UpdateMonitor.patch 2 Dec 2009 18:10:26 -0000 1.9
@@ -1,25 +1,19 @@
-diff -up azureus-4.2.0.8/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor azureus-4.2.0.8/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java
---- azureus-4.2.0.8/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor 2009-07-08 19:00:26.000000000 +0200
-+++ azureus-4.2.0.8/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2009-09-13 13:24:24.000000000 +0200
-@@ -100,66 +100,66 @@ public class UpdateMonitor
+diff -up azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java
+--- azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.no-update-manager-UpdateMonitor 2009-10-21 02:26:22.000000000 +0300
++++ azureus-4.3.0.0/org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2009-11-19 21:19:57.000000000 +0200
+@@ -98,70 +98,6 @@ public class UpdateMonitor
protected UpdateMonitor(AzureusCore _azureus_core) {
azCore = _azureus_core;
- PluginInterface defPI = PluginInitializer.getDefaultInterface();
- UpdateManager um = defPI.getUpdateManager();
-+// PluginInterface defPI = PluginInitializer.getDefaultInterface();
-+// UpdateManager um = defPI.getUpdateManager();
-
+-
- um.addListener(new UpdateManagerListener() {
- public void checkInstanceCreated(UpdateCheckInstance instance) {
- instance.addListener(UpdateMonitor.this);
-+// um.addListener(new UpdateManagerListener() {
-+// public void checkInstanceCreated(UpdateCheckInstance instance) {
-+// instance.addListener(UpdateMonitor.this);
-
+-
- if ( !instance.isLowNoise()){
-+// if ( !instance.isLowNoise()){
-
+-
- new updateStatusChanger(instance);
- }
- }
@@ -35,12 +29,15 @@ diff -up azureus-4.2.0.8/org/gudy/azureu
- + "accept.unverified.text", new String[] {
- update.getName()
- });
-- return uiFunctions.promptUser(title, text, new String[] {
+- UIFunctionsUserPrompter prompter = uiFunctions.getUserPrompter(title, text, new String[] {
- MessageText.getString("Button.yes"),
- MessageText.getString("Button.no")
-- }, 1, MSG_PREFIX + "accept.unverified",
-- MessageText.getString("MessageBoxWindow.nomoreprompting"), false,
-- 0) == 0;
+- }, 1);
+- prompter.setRemember(MSG_PREFIX + "accept.unverified", false,
+- MessageText.getString("MessageBoxWindow.nomoreprompting"));
+- prompter.setAutoCloseInMS(0);
+- prompter.open(null);
+- return prompter.waitUntilClosed() == 0;
- }
-
- return false;
@@ -59,7 +56,7 @@ diff -up azureus-4.2.0.8/org/gudy/azureu
- });
- uiFunctions.promptUser(title, text, new String[] {
- MessageText.getString("Button.ok")
-- }, 0, null, null, false, 0);
+- }, 0, null, null, false, 0, null);
- }
- }
- });
@@ -71,61 +68,11 @@ diff -up azureus-4.2.0.8/org/gudy/azureu
- performAutoCheck(false);
- }
- });
-+// new updateStatusChanger(instance);
-+// }
-+// }
-+// });
-+
-+// 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);
-+// }
-+// });
-
+-
DelayedTask delayed_task =
UtilitiesImpl.addDelayedTask(
-@@ -381,43 +381,6 @@ public class UpdateMonitor
+ "Update Check",
+@@ -381,43 +317,6 @@ public class UpdateMonitor
}
protected void performAutoCheck(final boolean start_of_day) {
@@ -169,7 +116,7 @@ diff -up azureus-4.2.0.8/org/gudy/azureu
}
public void
-@@ -427,76 +390,7 @@ public class UpdateMonitor
+@@ -427,76 +326,7 @@ public class UpdateMonitor
final boolean isRecheck,
final UpdateCheckInstanceListener l )
{
Index: azureus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-12/azureus.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- azureus.spec 13 Sep 2009 15:36:35 -0000 1.80
+++ azureus.spec 2 Dec 2009 18:10:26 -0000 1.81
@@ -1,8 +1,8 @@
%define _newname Vuze
Name: azureus
-Version: 4.2.0.8
-Release: 2%{?dist}
+Version: 4.3.0.4
+Release: 1%{?dist}
Summary: A BitTorrent Client
Group: Applications/Internet
License: GPLv2+
@@ -77,7 +77,7 @@ advanced users.
%patch9 -p0
%patch12 -p1 -b .no-updates-PluginInitializer
%patch13 -p1 -b .no-updates-PluginInterfaceImpl
-%patch14 -p0
+%patch14 -p1 -b .no-update-manager-AzureusCoreImpl
%patch15 -p0
%patch16 -p1 -b .no-update-manager-CoreUpdateChecker
%patch18 -p1 -b .no-update-manager-PluginInstallerImpl
@@ -125,7 +125,7 @@ rm org/gudy/azureus2/platform/win32/Plat
rm org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java
rm org/gudy/azureus2/ui/swt/osx/Start.java
rm org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
-%patch51 -b .boo-osx
+%patch51 -p1 -b .boo-osx
%patch52 -b .orig
%patch53 -p1 -b .boo-updating-w32
%patch54 -b .orig
@@ -242,6 +242,9 @@ fi
%{_datadir}/azureus
%changelog
+* Wed Dec 2 2009 David Juran <djuran at redhat.com> - 4.3.0.4-1
+- upgrade to 4.3.0.4 (Bz 540179)
+
* Sun Sep 13 2009 David Juran <djuran at redhat.com> - 4.2.0.8-2
- revive the no-updates patches (Bz515131)
- fix start-script to work when /usr/share/azureus/plugins/ is empty
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/F-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources 13 Sep 2009 08:49:25 -0000 1.17
+++ sources 2 Dec 2009 18:10:26 -0000 1.18
@@ -1 +1 @@
-81af0887805afe7bba9b651b022a7b1f Vuze_4.2.0.8_source.zip
+b5de3ffbcd16d1c69281de21c2550fc8 Vuze_4.3.0.4_source.zip
- Previous message: File 389-ds-base-1.2.5.rc1.tar.bz2 uploaded to lookaside cache by rmeggins
- Next message: rpms/389-ds-base/F-10 .cvsignore, 1.5, 1.6 389-ds-base-git-local.sh, 1.2, 1.3 389-ds-base-git.sh, 1.3, 1.4 389-ds-base.spec, 1.7, 1.8 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list