rpms/azureus/devel .cvsignore, 1.16, 1.17 azureus-4.0.0.4-boo-osx.diff, 1.2, 1.3 azureus-4.0.0.4-boo-windows.diff, 1.2, 1.3 azureus.spec, 1.78, 1.79 sources, 1.16, 1.17 build.xml, 1.1, NONE
David Juran
djuran at fedoraproject.org
Sun Sep 13 08:49:27 UTC 2009
- Previous message (by thread): rpms/maven-scm/devel maven-scm.spec,1.18,1.19
- Next message (by thread): rpms/audacious/F-11 audacious-1.5.1-pulseaudio-by-default.patch, NONE, 1.1 audacious-1.5.1-tuple_get_int-assertion.patch, NONE, 1.1 audacious.spec, 1.47, 1.48 audacious-1.1.0-amidi-backend.patch, 1.1, NONE audacious-1.1.0-no-rpath.patch, 1.2, NONE audacious-1.1.0-quoting.patch, 1.2, NONE audacious-1.1.1-controlsocket-name.patch, 1.1, NONE audacious-1.1.1-playlist-twenty.patch, 1.3, NONE audacious-1.2.1-relative-links.patch, 1.1, NONE audacious-1.2.1-shaded-skin.patch, 1.1, NONE audacious-1.4.2-id3tag-close-file.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: djuran
Update of /cvs/pkgs/rpms/azureus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24515
Modified Files:
.cvsignore azureus-4.0.0.4-boo-osx.diff
azureus-4.0.0.4-boo-windows.diff azureus.spec sources
Removed Files:
build.xml
Log Message:
- Upgrade to 4.2.0.8
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore 3 Aug 2009 19:05:58 -0000 1.16
+++ .cvsignore 13 Sep 2009 08:49:24 -0000 1.17
@@ -1 +1 @@
-Vuze_4.2.0.4_source.zip
+Vuze_4.2.0.8_source.zip
azureus-4.0.0.4-boo-osx.diff:
org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java | 19 -------------------
1 file changed, 19 deletions(-)
Index: azureus-4.0.0.4-boo-osx.diff
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-4.0.0.4-boo-osx.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- azureus-4.0.0.4-boo-osx.diff 3 Aug 2009 19:05:58 -0000 1.2
+++ azureus-4.0.0.4-boo-osx.diff 13 Sep 2009 08:49:25 -0000 1.3
@@ -1,221 +1,3 @@
-diff -urN org/gudy/azureus2/ui/swt.orig/osx/Start.java org/gudy/azureus2/ui/swt/osx/Start.java
---- org/gudy/azureus2/ui/swt.orig/osx/Start.java 2006-02-09 19:43:24.000000000 -0800
-+++ org/gudy/azureus2/ui/swt/osx/Start.java 1969-12-31 16:00:00.000000000 -0800
-@@ -1,74 +0,0 @@
--/*
-- * Created on May 30, 2004
-- * Created by Olivier Chalouhi
-- * Copyright (C) 2004, 2005, 2006 Aelitis, All Rights Reserved.
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- * AELITIS, SAS au capital de 46,603.30 euros
-- * 8 Allee Lenotre, La Grille Royale, 78600 Le Mesnil le Roi, France.
-- *
-- */
--package org.gudy.azureus2.ui.swt.osx;
--
--import java.io.OutputStreamWriter;
--import java.io.PrintWriter;
--import java.net.Socket;
--
--import org.gudy.azureus2.core3.util.Debug;
--
--
--public class Start {
-- public Start(String args[]) {
--// if(args.length == 0)
--// return;
--
-- Socket sck = null;
-- PrintWriter pw = null;
-- try {
-- System.out.println("StartSocket: passing startup args to already-running Azureus java process.");
--
-- sck = new Socket("127.0.0.1", 6880);
--
-- pw = new PrintWriter(new OutputStreamWriter(sck.getOutputStream(),"UTF8"));
--
-- StringBuffer buffer = new StringBuffer("Azureus Start Server Access;args;");
--
-- for(int i = 0 ; i < args.length ; i++) {
-- String arg = args[i].replaceAll("&","&&").replaceAll(";","&;");
-- buffer.append(arg);
-- buffer.append(';');
-- }
--
-- pw.println(buffer.toString());
-- pw.flush();
-- } catch(Exception e) {
-- Debug.printStackTrace( e );
-- } finally {
-- try {
-- if (pw != null)
-- pw.close();
-- } catch (Exception e) {
-- }
-- try {
-- if (sck != null)
-- sck.close();
-- } catch (Exception e) {
-- }
-- }
-- }
--
-- public static void main(String args[]) {
-- new Start(args);
-- }
-- }
-\ No newline at end of file
-diff -urN org/gudy/azureus2/ui/swt.orig/win32/Win32UIEnhancer.java org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
---- org/gudy/azureus2/ui/swt.orig/win32/Win32UIEnhancer.java 2008-07-03 02:43:40.000000000 -0700
-+++ org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java 1969-12-31 16:00:00.000000000 -0800
-@@ -1,135 +0,0 @@
--/**
-- * Copyright (C) 2006 Aelitis, All Rights Reserved.
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- * AELITIS, SAS au capital de 63.529,40 euros
-- * 8 Allee Lenotre, La Grille Royale, 78600 Le Mesnil le Roi, France.
-- *
-- */
--
--package org.gudy.azureus2.ui.swt.win32;
--
--import org.eclipse.swt.SWT;
--import org.eclipse.swt.graphics.Image;
--import org.eclipse.swt.graphics.ImageData;
--import org.eclipse.swt.internal.win32.OS;
--import org.eclipse.swt.internal.win32.TCHAR;
--
--/**
-- * @author TuxPaper
-- * @created Nov 29, 2006
-- *
-- * Note: You can safely exclude this class from the build path.
-- * All calls to this class use (or at least should use) reflection
-- */
--public class Win32UIEnhancer
--{
-- static String findProgramKey(String extension) {
-- if (extension == null)
-- SWT.error(SWT.ERROR_NULL_ARGUMENT);
-- if (extension.length() == 0)
-- return null;
-- if (extension.charAt(0) != '.')
-- extension = "." + extension; //$NON-NLS-1$
-- /* Use the character encoding for the default locale */
-- TCHAR key = new TCHAR(0, extension, true);
-- int[] phkResult = new int[1];
-- if (OS.RegOpenKeyEx(OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) {
-- return null;
-- }
-- int[] lpcbData = new int[1];
-- int result = OS.RegQueryValueEx(phkResult[0], null, 0, null, (TCHAR) null,
-- lpcbData);
-- if (result == 0) {
-- TCHAR lpData = new TCHAR(0, lpcbData[0] / TCHAR.sizeof);
-- result = OS.RegQueryValueEx(phkResult[0], null, 0, null, lpData, lpcbData);
-- if (result == 0)
-- return lpData.toString(0, lpData.strlen());
-- }
-- OS.RegCloseKey(phkResult[0]);
-- return null;
-- }
--
-- public static ImageData getBigImageData(String extension) {
-- String key = findProgramKey(extension);
-- if (key == null) {
-- return null;
-- }
--
-- /* Icon */
-- String DEFAULT_ICON = "\\DefaultIcon"; //$NON-NLS-1$
-- String iconName = getKeyValue(key + DEFAULT_ICON, true);
-- if (iconName == null)
-- iconName = ""; //$NON-NLS-1$
--
-- int nIconIndex = 0;
-- String fileName = iconName;
-- int index = iconName.indexOf(',');
-- if (index != -1) {
-- fileName = iconName.substring(0, index);
-- String iconIndex = iconName.substring(index + 1, iconName.length()).trim();
-- try {
-- nIconIndex = Integer.parseInt(iconIndex);
-- } catch (NumberFormatException e) {
-- }
-- }
-- /* Use the character encoding for the default locale */
-- TCHAR lpszFile = new TCHAR(0, fileName, true);
-- int[] phiconSmall = null, phiconLarge = new int[1];
-- OS.ExtractIconEx(lpszFile, nIconIndex, phiconLarge, phiconSmall, 1);
-- if (phiconLarge[0] == 0) {
-- return null;
-- }
-- Image image = Image.win32_new(null, SWT.ICON, phiconLarge[0]);
-- ImageData imageData = image.getImageData();
-- image.dispose();
-- return imageData;
-- }
--
-- static String getKeyValue(String string, boolean expand) {
-- /* Use the character encoding for the default locale */
-- TCHAR key = new TCHAR(0, string, true);
-- int[] phkResult = new int[1];
-- if (OS.RegOpenKeyEx(OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) {
-- return null;
-- }
-- String result = null;
-- int[] lpcbData = new int[1];
-- if (OS.RegQueryValueEx(phkResult[0], (TCHAR) null, 0, null, (TCHAR) null,
-- lpcbData) == 0) {
-- result = "";
-- int length = lpcbData[0] / TCHAR.sizeof;
-- if (length != 0) {
-- /* Use the character encoding for the default locale */
-- TCHAR lpData = new TCHAR(0, length);
-- if (OS.RegQueryValueEx(phkResult[0], null, 0, null, lpData, lpcbData) == 0) {
-- if (!OS.IsWinCE && expand) {
-- length = OS.ExpandEnvironmentStrings(lpData, null, 0);
-- if (length != 0) {
-- TCHAR lpDst = new TCHAR(0, length);
-- OS.ExpandEnvironmentStrings(lpData, lpDst, length);
-- result = lpDst.toString(0, Math.max(0, length - 1));
-- }
-- } else {
-- length = Math.max(0, lpData.length() - 1);
-- result = lpData.toString(0, length);
-- }
-- }
-- }
-- }
-- if (phkResult[0] != 0)
-- OS.RegCloseKey(phkResult[0]);
-- return result;
-- }
--}
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
azureus-4.0.0.4-boo-windows.diff:
platform/PlatformManagerFactory.java | 17 +++-----------
platform/PlatformManagerPluginDelegate.java | 9 ++++---
update/CoreUpdateChecker.java | 33 +++++++++++++++-------------
3 files changed, 27 insertions(+), 32 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.2 -r 1.3 azureus-4.0.0.4-boo-windows.diffIndex: azureus-4.0.0.4-boo-windows.diff
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus-4.0.0.4-boo-windows.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- azureus-4.0.0.4-boo-windows.diff 3 Aug 2009 19:05:58 -0000 1.2
+++ azureus-4.0.0.4-boo-windows.diff 13 Sep 2009 08:49:25 -0000 1.3
@@ -1,5853 +1,6 @@
-diff -urN org/gudy/azureus2/platform.orig/macosx/access/jnilib/make.mak org/gudy/azureus2/platform/macosx/access/jnilib/make.mak
---- org/gudy/azureus2/platform.orig/macosx/access/jnilib/make.mak 2006-07-21 09:21:40.000000000 -0700
-+++ org/gudy/azureus2/platform/macosx/access/jnilib/make.mak 1969-12-31 16:00:00.000000000 -0800
-@@ -1,12 +0,0 @@
--SDK = /Developer/SDKs/MacOSX10.4u.sdk
--ARCHS = -arch i386 -arch ppc
--LFLAGS = -bundle -isysroot $(SDK) $(ARCHS) -framework JavaVM -framework Carbon
--CFLAGS = -c $(ARCHS) -I $(SDK)/System/Library/Frameworks/JavaVM.framework/Headers -I $(SDK)/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/Headers
--
--
--OBJECTS = OSXAccess.o
--OUTLIB = libOSXAccess.jnilib
--
--all:
-- cc $(CFLAGS) OSXAccess.c
-- cc -o $(OUTLIB) $(LFLAGS) $(OBJECTS)
-diff -urN org/gudy/azureus2/platform.orig/macosx/access/jnilib/OSXAccess.c org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.c
---- org/gudy/azureus2/platform.orig/macosx/access/jnilib/OSXAccess.c 2007-03-07 17:40:26.000000000 -0800
-+++ org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.c 1969-12-31 16:00:00.000000000 -0800
-@@ -1,127 +0,0 @@
--#include <Carbon/Carbon.h>
--#include <jni.h>
--#include <AEDataModel.h>
--
--#define VERSION "1.03"
--
--/**
-- * AEDesc code from SWT, os_structs.c
-- * Copyright (c) 2000, 2006 IBM Corporation and others.
-- */
--typedef struct AEDesc_FID_CACHE {
-- int cached;
-- jclass clazz;
-- jfieldID descriptorType, dataHandle;
--} AEDesc_FID_CACHE;
--
--AEDesc_FID_CACHE AEDescFc;
--
--void cacheAEDescFields(JNIEnv *env, jobject lpObject)
--{
-- if (AEDescFc.cached) return;
-- AEDescFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- AEDescFc.descriptorType = (*env)->GetFieldID(env, AEDescFc.clazz, "descriptorType", "I");
-- AEDescFc.dataHandle = (*env)->GetFieldID(env, AEDescFc.clazz, "dataHandle", "I");
-- AEDescFc.cached = 1;
--}
--
--AEDesc *getAEDescFields(JNIEnv *env, jobject lpObject, AEDesc *lpStruct)
--{
-- if (!AEDescFc.cached) cacheAEDescFields(env, lpObject);
-- lpStruct->descriptorType = (DescType)(*env)->GetIntField(env, lpObject, AEDescFc.descriptorType);
-- lpStruct->dataHandle = (AEDataStorage)(*env)->GetIntField(env, lpObject, AEDescFc.dataHandle);
-- return lpStruct;
--}
--
--void setAEDescFields(JNIEnv *env, jobject lpObject, AEDesc *lpStruct)
--{
-- if (!AEDescFc.cached) cacheAEDescFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, AEDescFc.descriptorType, (jint)lpStruct->descriptorType);
-- (*env)->SetIntField(env, lpObject, AEDescFc.dataHandle, (jint)lpStruct->dataHandle);
--}
--
--JNIEXPORT jint JNICALL Java_org_gudy_azureus2_platform_macosx_access_jnilib_OSXAccess_AEGetParamDesc
-- (JNIEnv *env, jclass that, jint theAppleEvent, jint theAEKeyword,
-- jint desiredType, jobject result)
--{
-- AEDesc _result, *lpresult=NULL;
--
-- jint rc = 0;
--
-- if (result) if ((lpresult = getAEDescFields(env, result, &_result)) == NULL) goto fail;
--
-- rc = (jint)AEGetParamDesc((const AppleEvent *)theAppleEvent,
-- (AEKeyword)theAEKeyword,
-- (DescType)desiredType,
-- (AEDescList *)lpresult);
--
--fail:
-- if (result && lpresult) setAEDescFields(env, result, lpresult);
--
-- return rc;
--}
--
--JNIEXPORT jstring JNICALL
--Java_org_gudy_azureus2_platform_macosx_access_jnilib_OSXAccess_getVersion(
-- JNIEnv *env,
-- jclass cla )
--{
-- jstring result =(*env)->NewStringUTF(env, (char *)VERSION);
--
-- return( result );
--}
--
--JNIEXPORT jstring JNICALL
--Java_org_gudy_azureus2_platform_macosx_access_jnilib_OSXAccess_getDocDir(
-- JNIEnv *env,
-- jclass cla )
--{
-- CFURLRef docURL;
-- CFStringRef docPath;
-- FSRef fsRef;
-- OSErr err = FSFindFolder(kUserDomain, kDocumentsFolderType, kDontCreateFolder, &fsRef);
--
-- jstring result = 0;
--
-- if (err == noErr) {
-- if((docURL = CFURLCreateFromFSRef( kCFAllocatorSystemDefault, &fsRef))) {
-- docPath = CFURLCopyFileSystemPath(docURL, kCFURLPOSIXPathStyle);
--
-- if (docPath) {
-- // convert to unicode
-- CFIndex strLen = CFStringGetLength( docPath );
-- UniChar uniStr[ strLen ];
-- CFRange strRange;
-- strRange.location = 0;
-- strRange.length = strLen;
-- CFStringGetCharacters( docPath, strRange, uniStr );
--
-- result = (*env)->NewString( env, (jchar*)uniStr, (jsize)strLen );
--
-- CFRelease(docPath);
--
-- return result;
-- }
-- CFRelease(docURL);
-- }
--
-- return result;
-- }
--}
--
--JNIEXPORT void JNICALL
--Java_org_gudy_azureus2_platform_macosx_access_jnilib_OSXAccess_memmove(
-- JNIEnv *env,
-- jclass cla,
-- jbyteArray dest,
-- jint src,
-- jint count)
--{
-- jbyte *dest1;
--
-- if (dest) {
-- dest1 = (*env)->GetByteArrayElements(env, dest, NULL);
-- memmove((void *)dest1, (void *)src, count);
-- (*env)->ReleaseByteArrayElements(env, dest, dest1, 0);
-- }
--}
-diff -urN org/gudy/azureus2/platform.orig/macosx/access/jnilib/OSXAccess.java org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java
---- org/gudy/azureus2/platform.orig/macosx/access/jnilib/OSXAccess.java 2007-03-07 16:49:10.000000000 -0800
-+++ org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java 1969-12-31 16:00:00.000000000 -0800
-@@ -1,58 +0,0 @@
--/*
-- * Created on Jul 21, 2006 3:19:03 PM
-- * Copyright (C) 2006 Aelitis, All Rights Reserved.
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- * AELITIS, SAS au capital de 46,603.30 euros
-- * 8 Allee Lenotre, La Grille Royale, 78600 Le Mesnil le Roi, France.
-- */
--package org.gudy.azureus2.platform.macosx.access.jnilib;
--
--import org.eclipse.swt.internal.carbon.AEDesc;
--
--import org.gudy.azureus2.core3.util.*;
--
--/**
-- * @author TuxPaper
-- * @created Jul 21, 2006
-- *
-- */
--public class OSXAccess
--{
-- private static boolean bLoaded = false;
--
-- static {
-- try {
-- System.loadLibrary ("OSXAccess");
-- System.out.println("OSXAccess v" + getVersion() + " Load complete!");
-- bLoaded = true;
-- } catch (UnsatisfiedLinkError e1) {
[...5497 lines suppressed...]
-- // get size here so it is cached
--
-- rdf.getTimeoutDownloader(rdf.getRetryDownloader(alternate_rdl,RD_SIZE_RETRIES),RD_SIZE_TIMEOUT).getSize();
--
--
-- List update_desc = new ArrayList();
--
-- List desc_lines = HTMLUtils.convertHTMLToText( "", sf_details.getDescription());
--
-- update_desc.addAll( desc_lines );
--
-- List comment_lines = HTMLUtils.convertHTMLToText( " ", sf_details.getComment());
--
-- update_desc.addAll( comment_lines );
--
-- String[] update_d = new String[update_desc.size()];
--
-- update_desc.toArray( update_d );
--
-- final Update update =
-- checker.addUpdate(
-- UPDATE_NAME,
-- update_d,
-- target_version,
-- alternate_rdl,
-- Update.RESTART_REQUIRED_YES );
--
-- update.setDescriptionURL(sf_details.getInfoURL());
--
-- alternate_rdl.addListener(
-- new ResourceDownloaderAdapter()
-- {
-- public boolean
-- completed(
-- final ResourceDownloader downloader,
-- InputStream data )
-- {
-- installUpdate( checker, update, downloader, data );
--
-- return( true );
-- }
-- });
-- }
-- }catch( Throwable e ){
--
-- Debug.printStackTrace( e );
--
-- checker.reportProgress( "Failed to load plugin details for the platform manager: " + Debug.getNestedExceptionMessage(e));
--
-- checker.failed();
--
-- }finally{
--
-- checker.completed();
-- }
-- }
--
-- protected void
-- installUpdate(
-- UpdateChecker checker,
-- Update update,
-- ResourceDownloader rd,
-- InputStream data )
-- {
-- ZipInputStream zip = null;
--
-- try {
-- data = update.verifyData( data, true );
--
-- rd.reportActivity( "Data verified successfully" );
--
-- UpdateInstaller installer = checker.createInstaller();
--
-- zip = new ZipInputStream(data);
--
-- ZipEntry entry = null;
--
-- while ((entry = zip.getNextEntry()) != null) {
--
-- String name = entry.getName();
--
-- if (name.toLowerCase().startsWith("windows/")) {
--
-- // win32 only files
--
-- name = name.substring(8);
--
-- // skip the directory entry
--
-- if (name.length() > 0) {
--
-- rd.reportActivity("Adding update action for '" + name + "'");
--
-- if (Logger.isEnabled())
-- Logger.log(new LogEvent(LOGID,
-- "PlatformManager:Win32 adding action for '" + name + "'"));
--
-- installer.addResource(name, zip, false);
--
-- installer.addMoveAction(name, installer.getInstallDir()
-- + File.separator + name);
-- }
-- }
-- }
-- } catch (Throwable e) {
--
-- rd.reportActivity("Update install failed:" + e.getMessage());
-- }finally{
--
-- if ( zip != null ){
--
-- try{
-- zip.close();
--
-- }catch( Throwable e ){
-- }
-- }
-- }
-- }
--
-- protected List
-- splitMultiLine(
-- String indent,
-- String text )
-- {
-- int pos = 0;
--
-- String lc_text = text.toLowerCase();
--
-- List lines = new ArrayList();
--
-- while( true ){
--
-- String line;
--
-- int p1 = lc_text.indexOf( "<br>", pos );
--
-- if ( p1 == -1 ){
--
-- line = text.substring(pos);
--
-- }else{
--
-- line = text.substring(pos,p1);
--
-- pos = p1+4;
-- }
--
-- lines.add( indent + line );
--
-- if ( p1 == -1 ){
--
-- break;
-- }
-- }
--
-- return( lines );
-- }
--}
-diff -up azureus-4.2.0.4/org/gudy/azureus2/platform/PlatformManagerFactory.java.foo azureus-4.2.0.4/org/gudy/azureus2/platform/PlatformManagerFactory.java
---- org/gudy/azureus2/platform/PlatformManagerFactory.java.foo 2009-05-13 20:50:56.000000000 +0300
-+++ org/gudy/azureus2/platform/PlatformManagerFactory.java 2009-07-30 22:05:47.000000000 +0300
+diff -up azureus-4.2.0.8/org/gudy/azureus2/platform/PlatformManagerFactory.java.boo-windows azureus-4.2.0.8/org/gudy/azureus2/platform/PlatformManagerFactory.java
+--- azureus-4.2.0.8/org/gudy/azureus2/platform/PlatformManagerFactory.java.boo-windows 2009-05-13 20:50:56.000000000 +0200
++++ azureus-4.2.0.8/org/gudy/azureus2/platform/PlatformManagerFactory.java 2009-09-13 09:11:45.000000000 +0200
@@ -48,19 +48,9 @@ PlatformManagerFactory
if ( platform_manager == null && !force_dummy ){
@@ -5881,9 +34,28 @@ diff -up azureus-4.2.0.4/org/gudy/azureu
}
return( platform_manager );
-diff -up azureus-4.2.0.4/org/gudy/azureus2/update/CoreUpdateChecker.java.original azureus-4.2.0.4/org/gudy/azureus2/update/CoreUpdateChecker.java
---- org/gudy/azureus2/update/CoreUpdateChecker.java.original 2009-07-31 22:04:53.000000000 +0300
-+++ org/gudy/azureus2/update/CoreUpdateChecker.java 2009-07-31 22:13:46.000000000 +0300
+diff -up azureus-4.2.0.8/org/gudy/azureus2/platform/PlatformManagerPluginDelegate.java.boo-windows azureus-4.2.0.8/org/gudy/azureus2/platform/PlatformManagerPluginDelegate.java
+--- azureus-4.2.0.8/org/gudy/azureus2/platform/PlatformManagerPluginDelegate.java.boo-windows 2009-08-25 02:14:26.000000000 +0200
++++ azureus-4.2.0.8/org/gudy/azureus2/platform/PlatformManagerPluginDelegate.java 2009-09-13 09:16:41.000000000 +0200
+@@ -44,10 +44,11 @@ public class PlatformManagerPluginDelega
+ PlatformManager platform = PlatformManagerFactory.getPlatformManager();
+
+ int platformType = platform.getPlatformType();
+- if ( platformType == PlatformManager.PT_WINDOWS ){
+- org.gudy.azureus2.platform.win32.PlatformManagerUpdateChecker plugin = new org.gudy.azureus2.platform.win32.PlatformManagerUpdateChecker();
+- plugin.initialize(pluginInterface);
+- }else if ( platformType == PlatformManager.PT_MACOSX ){
++// if ( platformType == PlatformManager.PT_WINDOWS ){
++// org.gudy.azureus2.platform.win32.PlatformManagerUpdateChecker plugin = new org.gudy.azureus2.platform.win32.PlatformManagerUpdateChecker();
++// plugin.initialize(pluginInterface);
++// }else
++ if ( platformType == PlatformManager.PT_MACOSX ){
+ org.gudy.azureus2.platform.macosx.PlatformManagerUpdateChecker plugin = new org.gudy.azureus2.platform.macosx.PlatformManagerUpdateChecker();
+ plugin.initialize(pluginInterface);
+ }else if ( platformType == PlatformManager.PT_UNIX ){
+diff -up azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java.boo-windows azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java
+--- azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java.boo-windows 2009-07-07 00:52:10.000000000 +0200
++++ azureus-4.2.0.8/org/gudy/azureus2/update/CoreUpdateChecker.java 2009-09-13 09:11:45.000000000 +0200
@@ -38,8 +38,8 @@ import org.gudy.azureus2.core3.logging.*
import org.gudy.azureus2.core3.config.*;
import org.gudy.azureus2.core3.html.*;
Index: azureus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- azureus.spec 4 Aug 2009 13:52:13 -0000 1.78
+++ azureus.spec 13 Sep 2009 08:49:25 -0000 1.79
@@ -1,8 +1,8 @@
%define _newname Vuze
Name: azureus
-Version: 4.2.0.4
-Release: 2%{?dist}
+Version: 4.2.0.8
+Release: 1%{?dist}
Summary: A BitTorrent Client
Group: Applications/Internet
License: GPLv2+
@@ -14,13 +14,6 @@ Source1: azureus.script
Source2: Azureus.desktop
Source3: azureus.applications
-#retrieved from CVS
-Source4: build.xml
-#Source4: azureus-License.txt
-
-#Source5: azplugins_2.1.6.jar
-#Source6: bdcc_2.2.2.zip
-
#Patch0: azureus-remove-win32-osx-platforms.patch
Patch2: azureus-cache-size.patch
Patch3: azureus-remove-manifest-classpath.patch
@@ -79,7 +72,6 @@ advanced users.
%prep
%setup -q -c
-cp %{SOURCE4} .
#%patch0 -p0
%patch2 -p0
%patch3 -p1 -b .remove-manifest-classpath
@@ -107,9 +99,34 @@ cp %{SOURCE4} .
rm org/gudy/azureus2/platform/macosx/access/cocoa/CocoaJavaBridge.java
rm org/gudy/azureus2/platform/macosx/PlatformManagerImpl.java
rm org/gudy/azureus2/platform/win32/PlatformManagerImpl.java
-%patch50 -b .boo-windows
+rm org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java
+rm org/gudy/azureus2/platform/win32/access/AEWin32Access.java
+rm org/gudy/azureus2/platform/win32/access/impl/AEWin32AccessInterface.java
+rm org/gudy/azureus2/platform/win32/access/impl/aereg.cpp
+rm org/gudy/azureus2/platform/win32/access/impl/AEWin32AccessImpl.java
+rm org/gudy/azureus2/platform/win32/access/impl/org_gudy_azureus2_platform_win32_access_impl_AEWin32AccessInterface.h
+rm org/gudy/azureus2/platform/win32/access/impl/Test.java
+rm org/gudy/azureus2/platform/macosx/NativeInvocationBridge.java
+rm org/gudy/azureus2/platform/macosx/PListEditor.java
+rm org/gudy/azureus2/platform/win32/access/AEWin32AccessException.java
+rm org/gudy/azureus2/platform/win32/access/AEWin32AccessListener.java
+rm org/gudy/azureus2/platform/win32/access/AEWin32Manager.java
+rm org/gudy/azureus2/platform/win32/access/impl/aenet.cpp
+rm org/gudy/azureus2/platform/win32/access/impl/aenet.h
+rm org/gudy/azureus2/platform/win32/access/impl/aereg.dsp
+rm org/gudy/azureus2/platform/win32/access/impl/aereg.dsw
+rm org/gudy/azureus2/platform/win32/access/impl/aereg.h
+rm org/gudy/azureus2/platform/win32/access/impl/AEWin32AccessCallback.java
+rm org/gudy/azureus2/platform/win32/access/impl/AEWin32AccessExceptionImpl.java
+rm org/gudy/azureus2/platform/win32/access/impl/generate_ini.bat
+rm org/gudy/azureus2/platform/win32/access/impl/StdAfx.cpp
+rm org/gudy/azureus2/platform/win32/access/impl/StdAfx.h
+rm org/gudy/azureus2/platform/win32/PlatformManagerUpdateChecker.java
+%patch50 -p1 -b .boo-windows
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
%patch52 -b .orig
%patch53 -p1 -b .boo-updating-w32
@@ -216,7 +233,7 @@ fi
%files
%defattr(-,root,root)
-%doc ChangeLog.txt
+%doc ChangeLog.txt GPL.txt
%{_datadir}/applications/*
%{_datadir}/application-registry/*
%{_datadir}/pixmaps/azureus.png
@@ -227,6 +244,9 @@ fi
%{_datadir}/azureus
%changelog
+* Sat Sep 12 2009 David Juran <djuran at redhat.com> - 4.2.0.8-1
+- Upgrade to 4.2.0.8
+
* Tue Aug 4 2009 David Juran <david at juran.se> - 4.2.0.4-2
- Fix Bz 515228 properly
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources 3 Aug 2009 19:05:59 -0000 1.16
+++ sources 13 Sep 2009 08:49:25 -0000 1.17
@@ -1 +1 @@
-5145354022b67cef3a26ac7f5bd1c4fb Vuze_4.2.0.4_source.zip
+81af0887805afe7bba9b651b022a7b1f Vuze_4.2.0.8_source.zip
--- build.xml DELETED ---
- Previous message (by thread): rpms/maven-scm/devel maven-scm.spec,1.18,1.19
- Next message (by thread): rpms/audacious/F-11 audacious-1.5.1-pulseaudio-by-default.patch, NONE, 1.1 audacious-1.5.1-tuple_get_int-assertion.patch, NONE, 1.1 audacious.spec, 1.47, 1.48 audacious-1.1.0-amidi-backend.patch, 1.1, NONE audacious-1.1.0-no-rpath.patch, 1.2, NONE audacious-1.1.0-quoting.patch, 1.2, NONE audacious-1.1.1-controlsocket-name.patch, 1.1, NONE audacious-1.1.1-playlist-twenty.patch, 1.3, NONE audacious-1.2.1-relative-links.patch, 1.1, NONE audacious-1.2.1-shaded-skin.patch, 1.1, NONE audacious-1.4.2-id3tag-close-file.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list