Author: arekm                        Date: Sun Jul  1 13:55:22 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 3.3 but install fails (Could not create type regexpmapper due to No supported 
regular expression matcher found)

---- Files affected:
SPECS:
   eclipse.spec (1.79 -> 1.80) 

---- Diffs:

================================================================
Index: SPECS/eclipse.spec
diff -u SPECS/eclipse.spec:1.79 SPECS/eclipse.spec:1.80
--- SPECS/eclipse.spec:1.79     Tue Apr 10 19:54:23 2007
+++ SPECS/eclipse.spec  Sun Jul  1 15:55:17 2007
@@ -5,24 +5,22 @@
 #                        This will make building such things like Azureus 
possible without having
 #                        whole Eclipse suite installed.
 #
-%define                _ver_major      3.2.2
-%define                _buildid        200702121330
+%define                _ver_major      3.3
+%define                _buildid        200706251500
 #
 Summary:       Eclipse - an open extensible IDE
 Summary(pl.UTF-8):     Eclipse - otwarte, rozszerzalne środowisko 
programistyczne
 Name:          eclipse
 Version:       %{_ver_major}
-Release:       1
+Release:       0.1
 License:       EPL v1.0
 Group:         Development/Tools
 Source0:       
http://download.eclipse.org/eclipse/downloads/drops/R-%{_ver_major}-%{_buildid}/%{name}-sourceBuild-srcIncluded-%{_ver_major}.zip
-# Source0-md5: 5d1b9f6a146ffc59191e513083a6ec86
+# Source0-md5: 91c688221479986dbdd7d1a0771f04cc
 Source1:       %{name}.desktop
-Patch0:                %{name}-core_resources-makefile.patch
-Patch1:                %{name}-build.patch
 URL:           http://www.eclipse.org/
 BuildRequires: ant >= 1.6.1
-BuildRequires: jdk >= 1.4
+BuildRequires: jdk >= 1.6
 BuildRequires: pkgconfig
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.300
@@ -51,18 +49,17 @@
 
 %prep
 %setup -q -c
-%patch0 -p0
-%patch1 -p0
 
 %build
 unset CLASSPATH || :
 export JAVA_HOME=%{java_home}
 
-./build -os linux -ws gtk -arch %{_eclipse_arch} -target compile -java5home 
%{_libdir}/java
+./build -os linux -ws gtk -arch %{_eclipse_arch} -target compile
 
 export JAVA_INC="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
 
 %{__make} -C plugins/org.eclipse.core.filesystem/natives/unix/linux/ \
+    OPT_FLAGS="%{rpmcflags} $JAVA_INC" \
     CFLAGS="%{rpmcflags} $JAVA_INC" \
     LDFLAGS="%{rpmldflags}"
 
@@ -78,7 +75,7 @@
 
 unset JAVA_HOME || :
 export JAVA_HOME=%{java_home}
-./build -os linux -ws gtk -arch %{_eclipse_arch} -target install -java5home 
%{_libdir}/java
+./build -os linux -ws gtk -arch %{_eclipse_arch} -target install
 
 tar xfz result/linux-gtk-%{_eclipse_arch}-sdk.tar.gz -C 
$RPM_BUILD_ROOT%{_libdir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
@@ -256,6 +253,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.80  2007/07/01 13:55:17  arekm
+- 3.3 but install fails (Could not create type regexpmapper due to No 
supported regular expression matcher found)
+
 Revision 1.79  2007/04/10 17:54:23  glen
 - do not provide libcairo.so.2
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to