SPECS: Azureus.spec - Builds for me

[glen]

Author: glen                         Date: Sun Nov 25 13:48:50 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Builds for me

---- Files affected:
SPECS:
   Azureus.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/Azureus.spec
diff -u SPECS/Azureus.spec:1.16 SPECS/Azureus.spec:1.17
--- SPECS/Azureus.spec:1.16	Sun Nov 25 14:02:57 2007
+++ SPECS/Azureus.spec	Sun Nov 25 14:48:44 2007
@@ -13,14 +13,16 @@
 Source3:	%{name}.sh
 Patch0:		%{name}-buildfile.patch
 Patch1:		%{name}-nomacosx.patch
-Patch2:		%{name}-swt31.patch
 URL:		http://azureus.sourceforge.net/
 BuildRequires:	eclipse-swt >= 3.1.1
 BuildRequires:	jakarta-commons-cli
 BuildRequires:	jdk >= 1.4
+BuildRequires:	jpackage-utils
 BuildRequires:	logging-log4j
+BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
-Requires:	eclipse-swt >= 3.1.1
+Requires:	eclipse-swt >= 3.3
 Requires:	jakarta-commons-cli
 Requires:	jre >= 1.4
 Requires:	logging-log4j
@@ -44,15 +46,21 @@
 
 %prep
 %setup -q -c
-%patch0 -p0
+find '(' -name '*.java' -o -name '*.xml' ')' -print0 | xargs -0 sed -i -e 's,\r$,,'
+
+%patch0 -p1
 %patch1 -p1
-%patch2 -p1
+
+find -name osx | xargs rm -r
+find -name 'macosx' | xargs rm -r
+find -name 'win32*' | xargs rm -r
+find -name 'Win32*' | xargs rm -r
+# Remove test code
+rm org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java
 
 %build
-rm -rf org/gudy/azureus2/platform/macosx/access
-rm -rf org/gudy/azureus2/ui/swt/{osx,test}
-##export ANT_OPTS=-Xmx128M
-ant jar
+export ANT_OPTS=-Xmx128M
+%ant jar
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -79,6 +87,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2007-11-25 13:48:44  glen
+- Builds for me
+
 Revision 1.16  2007-11-25 13:02:57  glen
 - log4j pkg name fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/Azureus.spec?r1=1.16&r2=1.17&f=u