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

[Mat Booth]

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-phpeclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15267

Modified Files:
	eclipse-phpeclipse.spec 
Log Message:
* Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 1.2.0-0.3.svn1573
- Update for building against Eclipse SDK 3.4.




Index: eclipse-phpeclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-phpeclipse.spec	29 Jun 2008 18:30:45 -0000	1.6
+++ eclipse-phpeclipse.spec	7 Sep 2008 23:00:03 -0000	1.7
@@ -1,9 +1,9 @@
-%define eclipse_base     %{_datadir}/eclipse
+%define eclipse_base     %{_libdir}/eclipse
 %define gcj_support      1
 
 Name:      eclipse-phpeclipse
 Version:   1.2.0
-Release:   0.2.svn1573%{?dist}
+Release:   0.3.svn1573%{?dist}
 Summary:   PHP Eclipse plugin
 Group:     Development/Tools
 License:   CPL
@@ -35,10 +35,10 @@
 %endif
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
-BuildRequires:    eclipse-pde >= 1:3.3
+BuildRequires:    eclipse-pde >= 3.4
 Requires:         java
 Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:3.3
+Requires:         eclipse-platform >= 3.4
 Requires:         php >= 5
 Requires:         httpd
 
@@ -96,14 +96,19 @@
 
 %install
 rm -rf %{buildroot}
-install -d -m 755 %{buildroot}%{eclipse_base}
-unzip -q -d %{buildroot}%{eclipse_base}/.. build/rpmBuild/net.sourceforge.phpeclipse.feature.zip
-unzip -q -d %{buildroot}%{eclipse_base}/.. build/rpmBuild/net.sourceforge.phpeclipse.debug.feature.zip
-unzip -q -d %{buildroot}%{eclipse_base}/.. build/rpmBuild/net.sourceforge.phpeclipse.xdebug.feature.zip
+installDir=%{buildroot}%{_datadir}/eclipse/dropins/phpeclipse
+debugInstallDir=%{buildroot}%{_datadir}/eclipse/dropins/phpeclipse-debug
+xdebugInstallDir=%{buildroot}%{_datadir}/eclipse/dropins/phpeclipse-xdebug
+install -d -m 755 $installDir
+install -d -m 755 $debugInstallDir
+install -d -m 755 $xdebugInstallDir
+unzip -q -d $installDir build/rpmBuild/net.sourceforge.phpeclipse.feature.zip
+unzip -q -d $debugInstallDir build/rpmBuild/net.sourceforge.phpeclipse.debug.feature.zip
+unzip -q -d $xdebugInstallDir build/rpmBuild/net.sourceforge.phpeclipse.xdebug.feature.zip
 
 # need to recreate the symlinks to libraries that were setup in "prep"
 # because for some reason the ant copy task doesn't preserve them
-pushd %{buildroot}%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
+pushd $installDir/eclipse/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
 rm *.jar
 build-jar-repository -s -p . xml-commons-apis
 popd
@@ -122,37 +127,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{eclipse_base}/features/net.sourceforge.phpeclipse.feature_*/cpl-v10.html
-
-# main feature
-%{eclipse_base}/features/net.sourceforge.phpeclipse.feature_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.core_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.externaltools_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.help_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phphelp_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.smarty.ui_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.ui_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.webbrowser_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.xml.core_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.xml.ui_*
-
-# debug features
-%{eclipse_base}/features/net.sourceforge.phpeclipse.debug.feature_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.debug.core_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.debug.ui_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.launching_*
-%{eclipse_base}/features/net.sourceforge.phpeclipse.xdebug.feature_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.xdebug.core_*
-%{eclipse_base}/plugins/net.sourceforge.phpeclipse.xdebug.ui_*
-
+%doc net.sourceforge.phpeclipse.feature/cpl-v10.html
+%{_datadir}/eclipse/dropins/phpeclipse
+%{_datadir}/eclipse/dropins/phpeclipse-debug
+%{_datadir}/eclipse/dropins/phpeclipse-xdebug
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 1.2.0-0.3.svn1573
+- Update for building against Eclipse SDK 3.4.
+
 * Sun Jun 29 2008 Mat Booth <fedora at matbooth.co.uk> 1.2.0-0.2.svn1573
 - Add patch for Show External Preview functionality.
 - Add patch for Use External PHP Parser functionality.