rpms/eclipse-quickrex/devel eclipse-quickrex.spec,1.6,1.7

[Alphonse Van Assche (alcapcom)]

Author: alcapcom

Update of /cvs/pkgs/rpms/eclipse-quickrex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29947

Modified Files:
	eclipse-quickrex.spec 
Log Message:
* Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 3.5.0-8
- Update to build against Eclipse SDK 3.4



Index: eclipse-quickrex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-quickrex/devel/eclipse-quickrex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-quickrex.spec	18 Feb 2008 19:08:46 -0000	1.6
+++ eclipse-quickrex.spec	2 Aug 2008 17:40:20 -0000	1.7
@@ -1,5 +1,5 @@
 %define gcj_support         1
-%define eclipse_base        %{_datadir}/eclipse
+%define eclipse_base        %{_libdir}/eclipse
 %define upstream_name       QuickREx
 %define cvs_tag             QuickREx_3_5_0
 %define oro_jar             jakarta-oro-2.0.8.jar
@@ -7,7 +7,7 @@
 
 Name:           eclipse-quickrex
 Version:        3.5.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        %{upstream_name} is a regular-expression test Eclipse Plug-In
 
 Group:          Development/Tools
@@ -22,8 +22,6 @@
 # the package.
 Source2:        build.properties
 Source3:        feature.xml
-# This patch disables jregex support due to the fact that there isn't a Fedora
-# package of it.
 Patch0:         quickrex-disable-jregex-capability.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,37 +67,18 @@
 popd
 popd
 
-# See comments in the script to understand this.
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
-mkdir home
-
 %build
-SDK=$(cd SDK > /dev/null && pwd)
-
-# Eclipse may try to write to the home directory.
-homedir=$(cd home > /dev/null && pwd)
-
-java -cp $SDK/startup.jar \
-     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
-     org.eclipse.core.launcher.Main \
-     -application org.eclipse.ant.core.antRunner \
-     -Dtype=feature \
-     -Did=de.babe.eclipse.plugins.QuickREx \
-     -DbaseLocation=$SDK \
-     -DsourceDirectory=$(pwd) \
-     -DbuildDirectory=$(pwd)/build \
-     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
-     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \
-     -vmargs -Duser.home=$homedir 
+%{eclipse_base}/buildscripts/pdebuild
 
 %install
 rm -rf %{buildroot}
-install -d -m 755 %{buildroot}%{eclipse_base}
-unzip -q -d %{buildroot}%{eclipse_base}/.. \
+installDir=%{buildroot}%{eclipse_base}/dropins/quickrex
+install -d -m 755 $installDir
+unzip -q -d $installDir \
  build/rpmBuild/de.babe.eclipse.plugins.QuickREx.zip
 
 # Re-symlink
-pushd  %{buildroot}/%{eclipse_base}/plugins/de.babe.eclipse.plugins.QuickREx_%{version}/lib
+pushd  $installDir/eclipse/plugins/de.babe.eclipse.plugins.QuickREx_%{version}/lib
 rm %{oro_jar}
 rm %{regexp_jar}
 ln -s %{_javadir}/%{oro_jar}
@@ -129,16 +108,17 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{eclipse_base}/plugins/de.babe.eclipse.plugins.QuickREx_%{version}
-%doc %{eclipse_base}/plugins/de.babe.eclipse.plugins.QuickREx_%{version}/html
-%{eclipse_base}/features/de.babe.eclipse.plugins.QuickREx_%{version}
-%{eclipse_base}/plugins/de.babe.eclipse.plugins.QuickREx_%{version}/*
+%doc Plug-In/html
+%{eclipse_base}/dropins/quickrex
 %if %{gcj_support}
 %dir %{_libdir}/gcj/%{name}
 %{_libdir}/gcj/%{name}/%{upstream_name}.*
 %endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 3.5.0-8
+- Update to build against Eclipse SDK 3.4
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.5.0-7
 - Autorebuild for GCC 4.3