rpms/eclipse-cdt/FC-4 eclipse-cdt.spec,1.17,1.18
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Oct 21 18:59:30 UTC 2005
Author: overholt
Update of /cvs/dist/rpms/eclipse-cdt/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv18319
Modified Files:
eclipse-cdt.spec
Log Message:
* Fri Oct 21 2005 Andrew Overholt <overholt at redhat.com> 3.0.0_fc-1.FC4
- Build 3.0.0 for FC4
- Disable native compilation
Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/FC-4/eclipse-cdt.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- eclipse-cdt.spec 23 May 2005 14:23:56 -0000 1.17
+++ eclipse-cdt.spec 21 Oct 2005 18:59:26 -0000 1.18
@@ -1,5 +1,4 @@
Epoch: 1
-ExclusiveArch: i386 x86_64 ppc
%define gcj_support 1
%define pkg_summary C/C++ Development Tools (CDT) plugin for Eclipse
@@ -21,15 +20,15 @@
Summary: %{pkg_summary}
Name: %{eclipse_name}-cdt
+# FIXME: when 3.0.1 comes out, make "_fc" part of Release, not Version
Version: %{majmin}.%{micro}_fc
-Release: 0.M6.7
+Release: 1.FC4
License: Eclipse Public License - v 1.0 (EPL) <http://www.eclipse.org/legal/epl-v10.html>
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/cdt
Requires: eclipse-platform
-
-Source0: %{name}-fetched-src-3.0-I200505212125.tar.gz
+Source0: %{name}-fetched-src-3.0.0.tar.gz
Patch1: %{name}-no-cvs2-patch
Patch2: %{name}-platform-build-linux.patch
Patch3: %{name}-sdk-build-linux.patch
@@ -40,22 +39,27 @@
BuildRequires: eclipse-pde
%if %{gcj_support}
BuildRequires: gcc-java >= 4.0.0-1
-BuildRequires: java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_24rh
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
+BuildRequires: java-gcj-compat-devel >= 1.0.33
+Requires(post): java-gcj-compat >= 1.0.33
+Requires(postun): java-gcj-compat >= 1.0.33
%else
BuildRequires: java-devel >= 1.4.2
%endif
Requires: ctags gdb make
-Requires: eclipse-platform >= 3.1.0_fc-0.M7.4
+Requires: eclipse-platform >= 3.1.0
+%if %{gcj_support}
+ExclusiveArch: %{ix86} x86_64 ppc
+%else
+BuildArch: noarch
+%endif
BuildRoot: %{_tmppath}/%{name}-buildroot
%description
The eclipse-cdt package contains Eclipse features and plugins that are
useful for C and C++ development.
-
%prep
%setup -q -c
pushd "org.eclipse.cdt.releng"
@@ -97,7 +101,6 @@
java -cp $SDK/startup.jar \
-Duser.home=$homedir \
-Dosgi.install.area=%{eclipse_base} \
- -Dorg.eclipse.core.runtime.ignoreLockFile=true \
org.eclipse.core.launcher.Main \
-application org.eclipse.ant.core.antRunner \
-DjavacFailOnError=true \
@@ -111,24 +114,6 @@
else
buildArch=%{eclipse_arch}
fi
-
-%if %{gcj_support}
- mkdir native
- for file in $(pwd)/results/I.*/*.tar.gz; do
- case $file in
- */org.eclipse.cdt-*-linux.$buildArch.*)
- tar -zx -C native -f $file *.jar
- cd native
- %ifarch %{ix86} ppc
- find-and-aot-compile %{name}-native "-fPIC -fjni -O2"
- %else
- find-and-aot-compile %{name}-native "-fPIC -fjni -O1"
- %endif
- mv %{name}-native.tar.gz ..
- ;;
- esac
- done
-%endif
popd
%install
@@ -151,43 +136,6 @@
esac
done
-%if %{gcj_support}
-
- # Create plugins directory in eclipse lib base
- install -d -m755 $RPM_BUILD_ROOT/%{eclipse_lib_base}/plugins
-
- cd org.eclipse.cdt.releng/native
- tar zxf ../%{name}-native.tar.gz
- mv %{name}-native/eclipse/plugins/* $RPM_BUILD_ROOT/%{eclipse_lib_base}/plugins
-
- # Directory to hold all the .jar->.so mapping dbs
- install -d -m 755 $RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`
- install -d -m 755 $RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`.d
-
- # Create the cdt database
- gcjdbdir=$RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`.d
- mkdir -p $gcjdbdir
- gcj-dbtool -n $gcjdbdir/%{name}.db 8000
-
- # Populate it
- for j in `find $RPM_BUILD_ROOT/%{eclipse_base} -name \*.jar`; do
- lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
- lib=`dirname $lib`/lib`basename $lib`;
- ls -l $lib;
- if [ -f $lib ]; then
- gcj-dbtool -f $gcjdbdir/%{name}.db \
- $j `echo $lib | sed "s:$RPM_BUILD_ROOT/::"`;
- fi;
- done;
-
- # FIXME: temporarily disable org.eclipse.cdt.managedbuilder.core_3.0.0/libmngbuildcore.jar.so
- # see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=157123
- mv \
- $RPM_BUILD_ROOT/%{_libdir}/eclipse/plugins/org.eclipse.cdt.managedbuilder.core_3.0.0/libmngbuildcore.jar.so{,.bak}
-
-%endif
-
-
# We move the libraries to libdir, leaving symlinks behind. And since
# zip doesn't preserve file permissions, we must also mark all the .so
# files as executable.
@@ -204,27 +152,30 @@
done
)
+%if %{gcj_support}
+#aot-compile-rpm
+%endif
+
%clean
rm -rf ${RPM_BUILD_ROOT}
%if %{gcj_support}
%post
-/usr/bin/rebuild-gcj-db %{_libdir}
+/usr/bin/rebuild-gcj-db
%postun
-/usr/bin/rebuild-gcj-db %{_libdir}
+/usr/bin/rebuild-gcj-db
%endif
-
%files
%defattr(-,root,root)
-%if %{gcj_support}
-%{eclipse_lib_base}/plugins/org.eclipse.cdt*
-%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}.db
-%endif
%{eclipse_base}/features/org.eclipse.cdt*
%{eclipse_base}/plugins/org.eclipse.cdt*
-
+%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux.x86_3.0.0/os/linux/x86/libpty.so
+%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux.x86_3.0.0/os/linux/x86/libspawner.so
+%if %{gcj_support}
+#%{_libdir}/gcj/%{name}
+%endif
# Cannot get dir name org.eclipse.cdt.source.linux.*.x86_2.0.2 to glob
# properly. Will fix later
@@ -265,6 +216,27 @@
%changelog
+* Fri Oct 21 2005 Andrew Overholt <overholt at redhat.com> 3.0.0_fc-1.FC4
+- Build 3.0.0 for FC4
+- Disable native compilation
+
+* Tue Aug 23 2005 Andrew Overholt <overholt at redhat.com> 3.0.0_fc-1
+- Import new upstream version (3.0).
+
+* Thu Jul 14 2005 Andrew Overholt <overholt at redhat.com> 3.0.0_fc-0.RC2.1
+- Import new upstream version (3.0RC2).
+- Use gbenson's new aot-compile-rpm and change requirements appropriately.
+- Re-enable native compilation - let's see what happens.
+
+* Wed Jun 22 2005 Andrew Overholt <overholt at redhat.com> 3.0.0_fc-0.M7.1
+- Import new upstream version (3.0M7).
+- Remove refactoring/build.properties patch (now unneeeded).
+
+* Fri Jun 03 2005 Jeff Pound <jpound at redhat.com> 3.0.0_fc-0.M6.8
+- Patch refactoring/build.properties to include plugin.properties.
+- Temporarily move all *.so's to *.so.bak due to native compilation bug.
+- Temporarily remove gcj .jar -> .so db population.
+
* Mon May 23 2005 Andrew Overholt <overholt at redhat.com> 3.0.0_fc-0.M6.7
- Bring in new I-build to enable jump to Eclipse 3.1M7 and fix some critical
issues.
More information about the fedora-cvs-commits
mailing list