rpms/azureus/FC-5 azureus-MessageSlideShell-swt-3.1.patch, NONE, 1.1 azureus-no-update-manager-MainStatusBar.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 azureus-no-install-remove-plugins.patch, 1.1, 1.2 azureus-no-update-manager-AzureusCoreImpl.patch, 1.1, 1.2 azureus-no-update-manager-CoreUpdateChecker.patch, 1.1, 1.2 azureus-no-update-manager-UpdateMonitor.patch, 1.1, 1.2 azureus.spec, 1.19, 1.20 sources, 1.4, 1.5
Anthony Green (green)
fedora-extras-commits at redhat.com
Sat Apr 1 22:08:05 UTC 2006
Author: green
Update of /cvs/extras/rpms/azureus/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18279
Modified Files:
.cvsignore azureus-no-install-remove-plugins.patch
azureus-no-update-manager-AzureusCoreImpl.patch
azureus-no-update-manager-CoreUpdateChecker.patch
azureus-no-update-manager-UpdateMonitor.patch azureus.spec
sources
Added Files:
azureus-MessageSlideShell-swt-3.1.patch
azureus-no-update-manager-MainStatusBar.patch
Log Message:
Update to latest source snapshot.
azureus-MessageSlideShell-swt-3.1.patch:
--- NEW FILE azureus-MessageSlideShell-swt-3.1.patch ---
--- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.~1.15.~ 2006-03-20 23:10:27.000000000 -0800
+++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java 2006-03-25 17:30:47.000000000 -0800
@@ -269,13 +269,7 @@
// Create shell & widgets
shell = new Shell(display, SWT.ON_TOP);
- if (USE_SWT32_BG_SET) {
- try {
- shell.setBackgroundMode(SWT.INHERIT_DEFAULT);
- } catch (NoSuchMethodError e) {
- // Ignore
- }
- }
+
Utils.setShellIcon(shell);
shell.setText(popupParams.title);
@@ -507,13 +501,6 @@
gc.dispose();
boolean bAlternateDrawing = true;
- if (USE_SWT32_BG_SET) {
- try {
- shell.setBackgroundImage(imgBackground);
- bAlternateDrawing = false;
- } catch (NoSuchMethodError e) {
- }
- }
if (bAlternateDrawing) {
// Drawing of BG Image for pre SWT 3.2
azureus-no-update-manager-MainStatusBar.patch:
--- NEW FILE azureus-no-update-manager-MainStatusBar.patch ---
--- org/gudy/azureus2/ui/swt/mainwindow/MainStatusBar.java.~1.1.~ 2006-03-20 23:21:17.000000000 -0800
+++ org/gudy/azureus2/ui/swt/mainwindow/MainStatusBar.java 2006-03-25 18:13:47.000000000 -0800
@@ -544,8 +544,6 @@
});
statusDown.setMenu(menuDownSpeed);
- addUpdateListener();
-
return statusBar;
}
@@ -619,16 +617,6 @@
}
}
- private void addUpdateListener() {
- azureusCore.getPluginManager().getDefaultPluginInterface()
- .getUpdateManager().addListener(new UpdateManagerListener() {
- public void checkInstanceCreated(UpdateCheckInstance instance) {
-
- new updateStatusChanger(instance);
- }
- });
- }
-
protected class updateStatusChanger {
UpdateCheckInstance instance;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 10 Feb 2006 17:00:46 -0000 1.4
+++ .cvsignore 1 Apr 2006 22:08:05 -0000 1.5
@@ -1,3 +1,3 @@
+azureus2-cvs-20060325.tar.gz
azplugins_1.8.8.jar
-azureus2-cvs-20060209.tar.gz
bdcc_2.2.2.zip
azureus-no-install-remove-plugins.patch:
Index: azureus-no-install-remove-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-install-remove-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-install-remove-plugins.patch 9 Feb 2006 08:45:07 -0000 1.1
+++ azureus-no-install-remove-plugins.patch 1 Apr 2006 22:08:05 -0000 1.2
@@ -1,8 +1,8 @@
---- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.~1.58.~ 2006-01-31 14:43:47.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-02-09 00:05:11.000000000 -0500
+--- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.orig 2006-03-28 04:35:35.000000000 -0800
++++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java 2006-03-28 04:41:30.000000000 -0800
@@ -347,26 +347,6 @@
- menu_plugin.setMenu(pluginMenu);
- if(notMainWindow) {performOneTimeDisable(menu_plugin, true);}
+ menu_plugin_logViews.setMenu(pluginLogsMenu);
+ menu_plugin_logViews.setData("EOL", "1");
- new MenuItem(pluginMenu, SWT.SEPARATOR);
-
@@ -38,7 +38,7 @@
- help_checkupdate.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event e) {
- mainWindow.getShell().setFocus();
-- UpdateMonitor.getSingleton( mainWindow.getAzureusCore()).performCheck();
+- UpdateMonitor.getSingleton( mainWindow.getAzureusCore()).performCheck(true);
- }
- });
- }
azureus-no-update-manager-AzureusCoreImpl.patch:
Index: azureus-no-update-manager-AzureusCoreImpl.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-update-manager-AzureusCoreImpl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-update-manager-AzureusCoreImpl.patch 10 Feb 2006 17:00:46 -0000 1.1
+++ azureus-no-update-manager-AzureusCoreImpl.patch 1 Apr 2006 22:08:05 -0000 1.2
@@ -1,6 +1,6 @@
---- com/aelitis/azureus/core/impl/AzureusCoreImpl.java.orig 2006-02-09 23:23:01.000000000 -0500
-+++ com/aelitis/azureus/core/impl/AzureusCoreImpl.java 2006-02-09 23:23:19.000000000 -0500
-@@ -391,13 +391,6 @@
+--- 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 @@
if (Logger.isEnabled())
Logger.log(new LogEvent(LOGID, "Stop operation completes"));
@@ -11,6 +11,7 @@
-
- AzureusRestarterFactory.create( this ).restart( true );
- }
- }finally{
-
- stopping_sem.releaseForever();
+-
+ try{
+ ThreadGroup tg = Thread.currentThread().getThreadGroup();
+
azureus-no-update-manager-CoreUpdateChecker.patch:
Index: azureus-no-update-manager-CoreUpdateChecker.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-update-manager-CoreUpdateChecker.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-update-manager-CoreUpdateChecker.patch 10 Feb 2006 17:00:46 -0000 1.1
+++ azureus-no-update-manager-CoreUpdateChecker.patch 1 Apr 2006 22:08:05 -0000 1.2
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/update/CoreUpdateChecker.java.orig 2006-02-09 23:27:55.000000000 -0500
-+++ org/gudy/azureus2/update/CoreUpdateChecker.java 2006-02-09 23:28:47.000000000 -0500
-@@ -124,8 +124,6 @@
+--- org/gudy/azureus2/update/CoreUpdateChecker.java.orig 2006-03-25 14:18:45.000000000 -0800
++++ org/gudy/azureus2/update/CoreUpdateChecker.java 2006-03-25 17:19:32.000000000 -0800
+@@ -122,8 +122,6 @@
props.setProperty( "plugin.version", plugin_interface.getAzureusVersion());
rdf = plugin_interface.getUtilities().getResourceDownloaderFactory();
@@ -9,7 +9,7 @@
}
public String
-@@ -144,178 +142,9 @@
+@@ -142,155 +140,9 @@
checkForUpdate(
final UpdateChecker checker )
{
@@ -17,15 +17,7 @@
- String current_version = plugin_interface.getAzureusVersion();
-
- log.log( "Update check starts: current = " + current_version );
--
-- boolean TESTING = false; // !!!!TODO: REMOVE THIS
--
-- if ( TESTING ){
--
-- System.out.println( "CoreUpdater: !!!! Testing mode !!!!" );
--
-- }
--
+-
- Map decoded = VersionCheckClient.getSingleton().getVersionCheckInfo(
- first_check?VersionCheckClient.REASON_UPDATE_CHECK_START:VersionCheckClient.REASON_UPDATE_CHECK_PERIODIC);
-
@@ -61,26 +53,11 @@
-
- log.log( msg );
-
-- boolean latest_is_cvs = Constants.isCVSVersion( latest_version );
-- String latest_base = Constants.getBaseVersion( latest_version );
--
-- String current_base = Constants.getBaseVersion();
--
-- // currently we upgrade from, for example
-- // 1) 2.0.8.4 -> 2.0.8.6
-- // 2) 2.0.8.5_CVS -> 2.0.8.6
-- // but not to a CVS version (also currently never reported as latest...)
--
-- if ( latest_is_cvs && !TESTING ){
+- if ( !shouldUpdate( current_version, latest_version )){
-
- return;
- }
--
-- if ( Constants.compareVersions( current_base, latest_base ) >= 0 && !TESTING){
-
-- return;
-- }
--
- final String f_latest_version = latest_version;
- final String f_latest_file_name = latest_file_name;
-
azureus-no-update-manager-UpdateMonitor.patch:
Index: azureus-no-update-manager-UpdateMonitor.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-update-manager-UpdateMonitor.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-update-manager-UpdateMonitor.patch 10 Feb 2006 17:00:46 -0000 1.1
+++ azureus-no-update-manager-UpdateMonitor.patch 1 Apr 2006 22:08:05 -0000 1.2
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-02-09 23:25:26.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2006-02-09 23:26:30.000000000 -0500
-@@ -87,147 +87,18 @@
+--- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig 2006-03-28 04:35:36.000000000 -0800
++++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java 2006-03-28 04:44:37.000000000 -0800
+@@ -88,149 +88,19 @@
{
azureus_core = _azureus_core;
@@ -49,12 +49,14 @@
{
- boolean check_at_start = false;
- boolean check_periodic = false;
+- boolean bOldSWT = SWT.getVersion() < 3139;
-
- // no update checks for java web start
-
- if ( !SystemProperties.isJavaWebStartInstance()){
-
-- check_at_start = COConfigurationManager.getBooleanParameter( "update.start", true );
+- // force check when SWT is really old
+- check_at_start = COConfigurationManager.getBooleanParameter( "update.start", true ) || bOldSWT;
- check_periodic = COConfigurationManager.getBooleanParameter( "update.periodic", true );
- }
-
@@ -65,7 +67,7 @@
- if ( ( check_at_start && start_of_day) ||
- ( check_periodic && !start_of_day )){
-
-- performCheck(); // this will implicitly do usage stats
+- performCheck(bOldSWT); // this will implicitly do usage stats
-
- }else{
-
@@ -84,10 +86,11 @@
- }
- });
- }
++
}
public void
- performCheck()
+ performCheck(final boolean bForce)
{
- if ( SystemProperties.isJavaWebStartInstance()){
-
@@ -135,7 +138,7 @@
-
- current_update_instance =
- um.createUpdateCheckInstance(
-- UpdateCheckInstance.UCI_UPDATE,
+- bForce ? UpdateCheckInstance.UCI_INSTALL : UpdateCheckInstance.UCI_UPDATE,
- "update.instance.update" );
-
- current_update_instance.start();
Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- azureus.spec 14 Feb 2006 04:48:03 -0000 1.19
+++ azureus.spec 1 Apr 2006 22:08:05 -0000 1.20
@@ -1,49 +1,51 @@
-Name: azureus
-Version: 2.4.0.0
-Release: 0.20060209cvs_1%{?dist}
-Summary: A BitTorrent Client
-
-Group: Applications/Internet
-License: GPL
-URL: http://azureus.sourceforge.net
+Name: azureus
+Version: 2.4.0.3
+Release: 0.20060328cvs_1%{?dist}
+Summary: A BitTorrent Client
+
+Group: Applications/Internet
+License: GPL
+URL: http://azureus.sourceforge.net
# A cvs snapshot with the build and bouncycastle directories
# removed.
-Source0: azureus2-cvs-20060209.tar.gz
+Source0: azureus2-cvs-20060325.tar.gz
-Source1: azureus.script
-Source2: Azureus.desktop
-Source3: azureus.applications
-Source4: azureus-License.txt
-Source5: azureus-ChangeLog.txt
+Source1: azureus.script
+Source2: Azureus.desktop
+Source3: azureus.applications
+Source4: azureus-License.txt
+Source5: azureus-ChangeLog.txt
Source6: azplugins_1.8.8.jar
Source7: 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
-Patch4: azureus-ConfigSectionPlugins-swt-3.1.patch
-Patch5: azureus-Messages-swt-3.1.patch
-Patch6: azureus-TableView-swt-3.1.patch
-Patch7: azureus-themed.patch
-Patch8: azureus-rh-bugzilla-180418.patch
-Patch9: azureus-no-shared-plugins.patch
-Patch10: azureus-no-install-remove-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
-#Patch21: azureus-no-update-manager-TableView.patch
-Patch22: azureus-no-update-manager-UpdateMonitor.patch
-Patch23: azureus-no-update-manager-PluginInstallerImpl-2.patch
+Patch0: azureus-remove-win32-osx-platforms.patch
+Patch1: azureus-remove-win32-PlatformManagerUpdateChecker.patch
+Patch2: azureus-cache-size.patch
+Patch3: azureus-remove-manifest-classpath.patch
+Patch4: azureus-ConfigSectionPlugins-swt-3.1.patch
+Patch5: azureus-Messages-swt-3.1.patch
+Patch6: azureus-TableView-swt-3.1.patch
+Patch7: azureus-themed.patch
+Patch8: azureus-rh-bugzilla-180418.patch
+Patch9: azureus-no-shared-plugins.patch
+Patch10: azureus-no-install-remove-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
+#Patch21: azureus-no-update-manager-TableView.patch
+Patch22: azureus-no-update-manager-UpdateMonitor.patch
+Patch23: azureus-no-update-manager-PluginInstallerImpl-2.patch
+Patch24: azureus-MessageSlideShell-swt-3.1.patch
+Patch25: azureus-no-update-manager-MainStatusBar.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -84,20 +86,22 @@
%patch14 -p0
%patch15 -p0
%patch16 -p0
-%patch17 -p0
+#%patch17 -p0
%patch18 -p0
%patch19 -p0
%patch20 -p0
#%patch21 -p0
%patch22 -p0
%patch23 -p0
+%patch24 -p0
+%patch25 -p0
cp %{SOURCE4} License.txt
cp %{SOURCE5} ChangeLog.txt
%build
mkdir -p build/libs
build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 log4j gnu-crypto gtk2.8 glib0.2
-ln -s /usr/share/java/gcj-endorsed/bcprov-131.jar build/libs
+ln -s /usr/share/java/gcj-endorsed/bcprov-1.31.jar build/libs
find ./ -name osx | xargs rm -r
find ./ -name macosx | xargs rm -r
find ./ -name [Ww]in32\* | xargs rm -r
@@ -199,6 +203,10 @@
%{_libdir}/gcj/*
%changelog
+* Tue Mar 28 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_1
+- Update sources.
+- Fix bcprov jar file reference.
+
* Mon Feb 13 2006 Anthony Green <green at redhat.com> - 2.4.0.0-0.20060207cvs_1
- Remove absolute path from azureus-no-updates-PluginInterfaceImpl.patch.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 10 Feb 2006 17:00:46 -0000 1.4
+++ sources 1 Apr 2006 22:08:05 -0000 1.5
@@ -1,3 +1,3 @@
+a1827e2041841940c4ca16fdf240afac azureus2-cvs-20060325.tar.gz
28f136e1d99d8a0d0d04ef4398f782b4 azplugins_1.8.8.jar
-ed4b5f0e19ad6632198731baeb48aac5 azureus2-cvs-20060209.tar.gz
0e88c3952b36ba221e277420a7080b43 bdcc_2.2.2.zip
More information about the scm-commits
mailing list