rpms/azureus/devel .cvsignore, 1.8, 1.9 azureus-no-update-manager-SWTUpdateChecker.patch, 1.2, 1.3 azureus-no-update-manager-UpdateMonitor.patch, 1.3, 1.4 azureus-themed.patch, 1.4, 1.5 azureus.spec, 1.29, 1.30 sources, 1.8, 1.9 azureus-no-restart.patch, 1.2, NONE azureus-no-update-manager-MainWindow.patch, 1.1, NONE
Anthony Green (green)
fedora-extras-commits at redhat.com
Sun Aug 27 00:33:47 UTC 2006
Author: green
Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13215
Modified Files:
.cvsignore azureus-no-update-manager-SWTUpdateChecker.patch
azureus-no-update-manager-UpdateMonitor.patch
azureus-themed.patch azureus.spec sources
Removed Files:
azureus-no-restart.patch
azureus-no-update-manager-MainWindow.patch
Log Message:
Update to 2.5.0.0.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 30 Jul 2006 19:33:20 -0000 1.8
+++ .cvsignore 27 Aug 2006 00:33:46 -0000 1.9
@@ -1,3 +1,7 @@
-azureus2-cvs-20060702.tar.bz2
-bdcc_2.2.2.zip
+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
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- azureus-no-update-manager-SWTUpdateChecker.patch 29 May 2006 16:02:45 -0000 1.2
+++ azureus-no-update-manager-SWTUpdateChecker.patch 27 Aug 2006 00:33:46 -0000 1.3
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java.orig 2006-05-14 08:10:01.000000000 -0700
-+++ org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java 2006-05-26 09:25:21.000000000 -0700
-@@ -57,77 +57,13 @@
+--- 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()
{
@@ -14,9 +14,96 @@
- try{
- SWTVersionGetter versionGetter = new SWTVersionGetter( checker );
-
-- if( versionGetter.needsUpdate() && System.getProperty("azureus.skipSWTcheck") == null ) {
--
-- String[] mirrors = versionGetter.getMirrors();
+- boolean update_required = versionGetter.needsUpdate() &&
+- System.getProperty("azureus.skipSWTcheck") == null ;
+-
+- if ( update_required ){
+-
+- int update_prevented_version = COConfigurationManager.getIntParameter( "swt.update.prevented.version", -1 );
+-
+- try{
+- URL swt_url = SWT.class.getClassLoader().getResource("org/eclipse/swt/SWT.class");
+-
+- if ( swt_url != null ){
+-
+- String url_str = swt_url.toExternalForm();
+-
+- if ( url_str.startsWith("jar:file:")){
+-
+- File jar_file = FileUtil.getJarFileFromURL(url_str);
+-
+- String expected_location;
+-
+- if ( Constants.isOSX ){
+-
+- expected_location = checker.getCheckInstance().getManager().getInstallDir() + OSX_APP + "/Contents/Resources/Java";
+-
+- }else{
+-
+- expected_location = checker.getCheckInstance().getManager().getInstallDir();
+- }
+-
+- File expected_dir = new File( expected_location );
+-
+- File jar_file_dir = jar_file.getParentFile();
+-
+- // sanity check
+-
+- if ( expected_dir.exists() && jar_file_dir.exists() ){
+-
+- expected_dir = expected_dir.getCanonicalFile();
+- jar_file_dir = jar_file_dir.getCanonicalFile();
+-
+- if ( expected_dir.equals( jar_file_dir )){
+-
+- // everything looks ok
+-
+- if ( update_prevented_version != -1 ){
+-
+- update_prevented_version = -1;
+-
+- COConfigurationManager.setParameter( "swt.update.prevented.version", update_prevented_version );
+- }
+- }else{
+-
+- if ( update_prevented_version != versionGetter.getCurrentVersion()){
+-
+- String alert =
+- MessageText.getString(
+- "swt.alert.cant.update",
+- new String[]{
+- String.valueOf( versionGetter.getCurrentVersion()),
+- String.valueOf( versionGetter.getLatestVersion()),
+- jar_file_dir.toString(),
+- expected_dir.toString()});
+-
+- Logger.log( new LogAlert(LogAlert.UNREPEATABLE, LogEvent.LT_ERROR, alert ));
+-
+- update_prevented_version = versionGetter.getCurrentVersion();
+-
+- COConfigurationManager.setParameter( "swt.update.prevented.version", update_prevented_version );
+- }
+- }
+- }
+- }
+- }
+- }catch( Throwable e ){
+-
+- Debug.printStackTrace(e);
+- }
+-
+- if ( update_prevented_version == versionGetter.getCurrentVersion()){
+-
+- Logger.log(new LogEvent(LOGID, LogEvent.LT_ERROR, "SWT update aborted due to previously reported issues regarding its install location" ));
+-
+- checker.failed();
+-
+- checker.getCheckInstance().cancel();
+-
+- return;
+- }
+-
+- String[] mirrors = versionGetter.getMirrors();
-
- ResourceDownloader swtDownloader = null;
-
@@ -72,9 +159,10 @@
-
- }finally{
-
- checker.completed();
+- checker.completed();
- }
-
++ checker.completed();
}
private boolean
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- azureus-no-update-manager-UpdateMonitor.patch 29 May 2006 16:02:45 -0000 1.3
+++ azureus-no-update-manager-UpdateMonitor.patch 27 Aug 2006 00:33:46 -0000 1.4
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-05-14 08:10:01.000000000 -0700
-+++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2006-05-26 09:27:25.000000000 -0700
-@@ -90,206 +90,19 @@
+--- 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 @@
{
azureus_core = _azureus_core;
@@ -37,7 +37,7 @@
- SWT.YES | SWT.NO,
- SWT.NULL,
- false,
-- _main_window.getDisplay(),
+- SWTThread.getInstance().getDisplay(),
- MessageBoxWindow.ICON_WARNING,
- MessageText.getString( "UpdateMonitor.messagebox.accept.unverified.title" ),
- MessageText.getString(
@@ -64,8 +64,7 @@
- public void
- run()
- {
-- Utils.openMessageBox(
-- _main_window.getShell(),
+- Utils.openMessageBox(Utils.findAnyShell(),
- SWT.OK,
- "UpdateMonitor.messagebox.verification.failed",
- new String[]{ update.getName(), cause_str });
@@ -75,6 +74,7 @@
- });
-
- SimpleTimer.addPeriodicEvent(
+- "UpdateMon:autocheck",
- AUTO_UPDATE_CHECK_PERIOD,
- new TimerEventPerformer()
- {
@@ -89,6 +89,7 @@
- // wait a bit before starting check to give rest of AZ time to initialise
-
- new DelayedEvent(
+- "UpdateMon:wait",
- 2500,
- new AERunnable()
- {
@@ -129,6 +130,7 @@
- }else{
-
- new DelayedEvent(
+- "UpdateMon:wait2",
- 5000,
- new AERunnable()
- {
@@ -136,9 +138,12 @@
- runSupport()
- {
- if ( start_of_day ){
-- MainWindow.getWindow().setStatusText("");
+- UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
+- if (uiFunctions != null) {
+- uiFunctions.setStatusText("");
+- }
- }
-
+-
- CoreUpdateChecker.doUsageStats();
- }
- });
@@ -157,7 +162,7 @@
-
- return;
- }
-
+-
- // kill any existing update window
-
- if ( current_update_window != null && ! current_update_window.isDisposed()){
@@ -178,9 +183,11 @@
- current_update_instance.cancel();
- }
-
-- MainWindow mainWindow = MainWindow.getWindow();
--
-- mainWindow.setStatusText("MainWindow.status.checking ...");
+- 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
-
azureus-themed.patch:
Index: azureus-themed.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus-themed.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- azureus-themed.patch 29 May 2006 16:02:45 -0000 1.4
+++ azureus-themed.patch 27 Aug 2006 00:33:46 -0000 1.5
@@ -1,5 +1,5 @@
---- org/gudy/azureus2/ui/swt/ImageRepository.java.orig 2006-04-24 06:11:48.000000000 -0700
-+++ org/gudy/azureus2/ui/swt/ImageRepository.java 2006-05-12 09:54:14.000000000 -0700
+--- 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;
@@ -10,7 +10,7 @@
import java.util.*;
@@ -61,6 +63,25 @@
- loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash");
+ addPath("org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash");
}
+ private static org.gnu.gtk.IconTheme iconTheme;
@@ -33,66 +33,44 @@
+ }
+
public static void loadImages(Display display) {
- loadImage(display, "org/gudy/azureus2/ui/icons/a32.png", "azureus32");
- loadImage(display, "org/gudy/azureus2/ui/icons/a64.png", "azureus64");
-@@ -105,20 +126,44 @@
- //ToolBar Icons
+ addPath("org/gudy/azureus2/ui/icons/a32.png", "azureus32");
+ addPath("org/gudy/azureus2/ui/icons/a64.png", "azureus64");
+@@ -106,22 +127,22 @@
+ //ToolBar Icons
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif", "cb_open_no_default");
-+ loadImage(display,
-+ getThemedIcon ("fileopen", "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif"),
-+ "cb_open_no_default");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_folder.gif", "cb_open_folder");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_url.gif", "cb_open_url");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/new.gif", "cb_new");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/up.gif", "cb_up");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/down.gif", "cb_down");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/top.gif", "cb_top");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/bottom.gif", "cb_bottom");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/run.gif", "cb_run");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/start.gif", "cb_start");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/stop.gif", "cb_stop");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/remove.gif", "cb_remove");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/host.gif", "cb_host");
-- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/publish.gif", "cb_publish");
-+ loadImage(display,
-+ getThemedIcon ("filenew", "org/gudy/azureus2/ui/icons/toolbar/new.gif"),
-+ "cb_new");
-+ loadImage(display,
-+ getThemedIcon ("gtk-go-up", "org/gudy/azureus2/ui/icons/toolbar/up.gif"),
-+ "cb_up");
-+ loadImage(display,
-+ getThemedIcon ("gtk-go-down", "org/gudy/azureus2/ui/icons/toolbar/down.gif"),
-+ "cb_down");
-+ loadImage(display,
-+ getThemedIcon ("gtk-goto-top", "org/gudy/azureus2/ui/icons/toolbar/top.gif"),
-+ "cb_top");
-+ loadImage(display,
-+ getThemedIcon ("gtk-goto-bottom", "org/gudy/azureus2/ui/icons/toolbar/bottom.gif"),
-+ "cb_bottom");
-+ loadImage(display,
-+ getThemedIcon ("exec", "org/gudy/azureus2/ui/icons/toolbar/run.gif"),
-+ "cb_run");
-+ loadImage(display,
-+ getThemedIcon ("gtk-go-forward", "org/gudy/azureus2/ui/icons/toolbar/start.gif"),
-+ "cb_start");
-+ loadImage(display,
-+ getThemedIcon ("gtk-stop", "org/gudy/azureus2/ui/icons/toolbar/stop.gif"),
-+ "cb_stop");
-+ loadImage(display,
-+ getThemedIcon ("edit_remove", "org/gudy/azureus2/ui/icons/toolbar/remove.gif"),
-+ "cb_remove");
-+ loadImage(display,
-+ getThemedIcon ("gohome", "org/gudy/azureus2/ui/icons/toolbar/host.gif"),
-+ "cb_host");
-+ loadImage(display,
-+ getThemedIcon ("icon-html", "org/gudy/azureus2/ui/icons/toolbar/publish.gif"),
-+ "cb_publish");
- loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/sendto.png", "cb_send");
+ 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");
+ 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");
+- addPath("org/gudy/azureus2/ui/icons/toolbar/new.gif", "cb_new");
+- addPath("org/gudy/azureus2/ui/icons/toolbar/up.gif", "cb_up");
+- addPath("org/gudy/azureus2/ui/icons/toolbar/down.gif", "cb_down");
+- addPath("org/gudy/azureus2/ui/icons/toolbar/top.gif", "cb_top");
+- addPath("org/gudy/azureus2/ui/icons/toolbar/bottom.gif", "cb_bottom");
+- addPath("org/gudy/azureus2/ui/icons/toolbar/run.gif", "cb_run");
+- addPath("org/gudy/azureus2/ui/icons/toolbar/start.gif", "cb_start");
+- addPath("org/gudy/azureus2/ui/icons/toolbar/stop.gif", "cb_stop");
+- 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");
- //Status icons
-@@ -167,6 +212,16 @@
+ //Status icons
+@@ -181,6 +202,16 @@
Image im = getImage(name,false);
if(null == im) {
InputStream is = loader.getResourceAsStream(res);
@@ -109,7 +87,7 @@
if(null != is) {
try {
if(alpha == 255) {
-@@ -483,4 +538,4 @@
+@@ -513,4 +544,4 @@
return key;
}
Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- azureus.spec 13 Aug 2006 14:30:26 -0000 1.29
+++ azureus.spec 27 Aug 2006 00:33:46 -0000 1.30
@@ -1,8 +1,8 @@
ExclusiveArch: %{ix86} x86_64
Name: azureus
-Version: 2.4.0.3
-Release: 0.20060730cvs_1%{?dist}
+Version: 2.5.0.0
+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-cvs-20060702.tar.bz2
+Source0: azureus2-2.5.0.0.tar.gz
Source1: azureus.script
Source2: Azureus.desktop
@@ -28,13 +28,11 @@
Patch7: azureus-themed.patch
Patch8: azureus-rh-bugzilla-180418.patch
Patch9: azureus-no-shared-plugins.patch
-Patch11: azureus-no-restart.patch
Patch12: azureus-no-updates-PluginInitializer.patch
Patch13: azureus-no-updates-PluginInterfaceImpl.patch
Patch14: azureus-no-update-manager-AzureusCoreImpl.patch
Patch15: azureus-no-update-manager-CorePatchChecker.patch
Patch16: azureus-no-update-manager-CoreUpdateChecker.patch
-#Patch17: azureus-no-update-manager-MainWindow.patch
Patch18: azureus-no-update-manager-PluginInstallerImpl.patch
Patch19: azureus-no-update-manager-PluginUpdatePlugin.patch
Patch20: azureus-no-update-manager-SWTUpdateChecker.patch
@@ -46,6 +44,7 @@
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)
@@ -80,7 +79,7 @@
%patch7 -p0
%patch8 -p0
%patch9 -p0
-%patch11 -p0
+#%patch11 -p0
%patch12 -p0
%patch13 -p0
%patch14 -p0
@@ -94,9 +93,10 @@
%patch25 -p0
%patch26 -p0
%patch27 -p0
-%patch28 -p0
-%patch29 -p0
-%patch30 -p0
+#%patch28 -p0
+#%patch29 -p0
+#%patch30 -p0
+%patch31 -p0
cp %{SOURCE4} License.txt
%build
@@ -206,6 +206,9 @@
%{_libdir}/gcj/*
%changelog
+* Sat Aug 26 2006 Anthony Green <green at redhat.com> - 2.5.0.0-1
+- Update sources.
+
* Sun Aug 13 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060730cvs_1
- Update release.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 30 Jul 2006 19:33:20 -0000 1.8
+++ sources 27 Aug 2006 00:33:46 -0000 1.9
@@ -1,3 +1,7 @@
-836470482bd0c9356c3e0c77a52a3326 azureus2-cvs-20060702.tar.bz2
-0e88c3952b36ba221e277420a7080b43 bdcc_2.2.2.zip
+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
--- azureus-no-restart.patch DELETED ---
--- azureus-no-update-manager-MainWindow.patch DELETED ---
More information about the fedora-extras-commits
mailing list