SPECS: eclipse-swt.spec - updated to 3.1.2 - reversed cairo bcond ...

[adamg]

Author: adamg                        Date: Thu Jun 22 10:02:27 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 3.1.2
- reversed cairo bcond for now

---- Files affected:
SPECS:
   eclipse-swt.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/eclipse-swt.spec
diff -u SPECS/eclipse-swt.spec:1.6 SPECS/eclipse-swt.spec:1.7
--- SPECS/eclipse-swt.spec:1.6	Fri May 19 13:28:19 2006
+++ SPECS/eclipse-swt.spec	Thu Jun 22 12:02:22 2006
@@ -2,11 +2,11 @@
 #
 # Conditional build:
 %bcond_without	gnome		# build without gnome
-%bcond_without	cairo		# build without cairo
+%bcond_with	cairo		# build with cairo
 #
-%define   _buildid  200509290840
+%define   _buildid  200601181600
 #define   _mver   M6
-%define   _ver_major  3.1.1
+%define   _ver_major  3.1.2
 %define   _ver_minor  0
 %define   _ver_swt    3139
 %define   _ver    %{_ver_major}.%{_ver_minor}
@@ -42,7 +42,7 @@
 Group:		Libraries
 #Source0:	http://download.eclipse.org/downloads/drops/S-%{_ver_major}%{_mver}-%{_buildid}/eclipse-sourceBuild-srcIncluded-%{_ver_major}%{_mver}.zip
 Source0:	http://download.eclipse.org/eclipse/downloads/drops/R-%{_ver_major}-%{_buildid}/eclipse-sourceBuild-srcIncluded-%{_ver_major}.zip
-# Source0-md5:	0d78d5f8afe767014a1cc69ee8c20869
+# Source0-md5:	f2c8066151de14c5ccdf420266ce9f39
 Patch0:		%{name}-NULL.patch
 Patch1:		%{name}-makefile.patch
 Patch2:		%{name}-nognome.patch
@@ -58,7 +58,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	unzip
 BuildRequires:	zip
-Requires:	jakarta-ant
+Requires:	ant
 Requires:	jdk >= 1.4
 ExclusiveArch:	%{ix86} %{x8664} ppc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -75,7 +75,7 @@
 
 %prep
 %setup -q -c
-JAVA_HOME=%{_libdir}/java
+JAVA_HOME=%{java_home}
 export JAVA_HOME
 cd %{_swtsrcdir}
 ant src.zip
@@ -93,7 +93,7 @@
 patch -p0 < %{PATCH2}
 %endif
 
-JAVA_HOME=%{_libdir}/java
+JAVA_HOME=%{java_home}
 export JAVA_HOME
 export JAVA_INC="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
 %{__make} -f make_linux.mak all \
@@ -187,6 +187,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/06/22 10:02:22  adamg
+- updated to 3.1.2
+- reversed cairo bcond for now
+
 Revision 1.6  2006/05/19 11:28:19  jajcus
 - s/jakarta-ant/ant/ in BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/eclipse-swt.spec?r1=1.6&r2=1.7&f=u