? .build-4.0-1.b3.fc10.2.log Index: eclipse-photran.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-photran/devel/eclipse-photran.spec,v retrieving revision 1.2 diff -u -r1.2 eclipse-photran.spec --- eclipse-photran.spec 19 Feb 2008 17:02:43 -0000 1.2 +++ eclipse-photran.spec 30 Jul 2008 16:19:18 -0000 @@ -2,20 +2,12 @@ %define major 4 %define minor 0 %define majmin %{major}.%{minor} -%define eclipse_base %{_datadir}/eclipse -%define eclipse_lib_base %{_libdir}/eclipse - -# All arches line up except i386 -> x86 -%ifarch %{ix86} -%define eclipse_arch x86 -%else -%define eclipse_arch %{_arch} -%endif +%define eclipse_base %{_libdir}/eclipse Summary: Eclipse Fortran Development Tools (Photran) plugin Name: eclipse-photran Version: %{majmin} -Release: 1.b3%{?dist}.1 +Release: 1.b3%{?dist}.2 License: EPL Group: Development/Tools URL: http://www.eclipse.org/photran @@ -66,43 +58,15 @@ export JAVA_HOME=%{java_home} export PATH=%{java_bin}:/usr/bin:$PATH -# See comments in the script to understand this. -/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base} cdt -SDK=$(cd SDK >/dev/null && pwd) - -# Eclipse may try to write to the home directory. -mkdir home -homedir=$(cd home > /dev/null && pwd) - -java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{eclipse_lib_base}/configuration \ - -Duser.home=$homedir \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -Dtype=feature \ - -Did=org.eclipse.photran_feature \ - -DsourceDirectory=$(pwd) \ - -DbuildDirectory=$(pwd)/build \ - -DbaseLocation=$SDK \ - -DjavacSource=1.5 \ - -DjavacTarget=1.5 \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml - +%{eclipse_base}/buildscripts/pdebuild -d cdt \ + -a "-DjavacSource=1.5 -DjavacTarget=1.5" %install rm -rf ${RPM_BUILD_ROOT} -install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base} - -unzip -d ${RPM_BUILD_ROOT}/%{_datadir} build/rpmBuild/org.eclipse.photran_feature.zip +install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/photran -# We move arch-specific plugins to libdir. -mkdir -p ${RPM_BUILD_ROOT}%{eclipse_lib_base}/plugins -for archplugin in $(find ${RPM_BUILD_ROOT}%{eclipse_base}/plugins -name \*%{eclipse_arch}_%{version}\*); do - mv $archplugin ${RPM_BUILD_ROOT}%{eclipse_lib_base}/plugins - chmod -R 755 ${RPM_BUILD_ROOT}%{eclipse_lib_base}/plugins/$(basename $archplugin) -done +unzip -d ${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/photran build/rpmBuild/org.eclipse.photran_feature.zip %if %{gcj_support} aot-compile-rpm @@ -123,13 +87,17 @@ %files %defattr(-,root,root) %doc org.eclipse.photran-feature/epl-v10.html -%{eclipse_base}/plugins/* +%{eclipse_base}/dropins/photran %if %{gcj_support} %{_libdir}/gcj/%{name} %endif %changelog +* Wed Jul 30 2008 Andrew Overholt 4.0-1.b3 +- Update for building against Eclipse SDK 3.4 +- Move everything to %%{_libdir} + * Tue Feb 19 2008 Fedora Release Engineering - 4.0-1.b3.1 - Autorebuild for GCC 4.3