diff --git a/eclipse-cdt-no-sdkbuild.patch b/eclipse-cdt-no-sdkbuild.patch new file mode 100644 index 0000000..7f070dc --- /dev/null +++ b/eclipse-cdt-no-sdkbuild.patch @@ -0,0 +1,28 @@ +--- build.xml 2005-02-24 14:10:52.000000000 -0600 ++++ build.xml.new 2005-04-04 12:51:46.117849336 -0500 +@@ -37,15 +37,9 @@ + + + +- +- +- + + + +- +- +- + + + +@@ -57,9 +51,6 @@ + + + +- +- +- + + + diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 17daacb..6cddc3f 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -32,7 +32,7 @@ ExclusiveArch: i386 x86_64 ppc Summary: %{pkg_summary} Name: %{eclipse_name}-cdt Version: %{majmin}.%{micro}_fc -Release: 0.M5.2 +Release: 0.M5.3 License: Eclipse Public License - v 1.0 (EPL) Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/cdt @@ -48,7 +48,7 @@ Patch4: %{name}-no-cvs2-patch Patch5: %{name}-platform-build-linux.patch Patch6: %{name}-sdk-build-linux.patch Patch7: %{name}-no-tests.patch - +Patch8: %{name}-no-sdkbuild.patch BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: gtk2-devel BuildRequires: glib2-devel @@ -84,6 +84,7 @@ pushd "org.eclipse.cdt.releng" %patch5 -p0 %patch6 -p0 %patch7 -p0 +%patch8 -p0 popd # Upstream CVS includes random .so files. Let's remove them now. @@ -146,7 +147,7 @@ fi for file in $(pwd)/org.eclipse.cdt.releng/results/I.*/*.tar.gz; do case $file in - */org.eclipse.cdt.sdk-*-linux.$buildArch.*) + */org.eclipse.cdt-*-linux.$buildArch.*) tar -zxv -C $nativehome -f $file *.jar cd $nativehome/eclipse/plugins for jarname in `find . -type f -name "*.jar"`; do @@ -167,7 +168,7 @@ mkdir -p ${RPM_BUILD_ROOT}/%{eclipse_base} for file in $(pwd)/org.eclipse.cdt.releng/results/I.*/*.tar.gz; do case $file in - *org.eclipse.cdt.sdk-*-linux*) + *org.eclipse.cdt-*-linux*) # The ".." is needed since the zip files contain "eclipse/foo". (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && tar zxvf $file) ;; @@ -266,6 +267,9 @@ rebuild-gcj-db %{_libdir} %changelog +* Mon Apr 04 2005 Phil Muldoon 3.0.0_fc-0.M5.3 +- Added eclipse-cdt-no-sdkbuild.patch to build for platform only (fc4 space crunch) + * Sun Apr 03 2005 Andrew Overholt 3.0.0_fc-0.M5.2 - Make use of rebuild-gcj-db. - Use system-wide classmap.db.