rpms/eclipse-dtp/devel eclipse-dtp-remove-duplicate-plugin.patch, NONE, 1.1 eclipse-dtp.spec, 1.7, 1.8

[mbooth]

Author: mbooth

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

Modified Files:
	eclipse-dtp.spec 
Added Files:
	eclipse-dtp-remove-duplicate-plugin.patch 
Log Message:
* Tue Jul 14 2009 Mat Booth <fedora at matbooth.co.uk> 1.7.0-3
- Disable jar repacking because of a bug in redhat-rpm-config, see #461854.
- Update dependency on wsdl4j.

* Sun Jul 05 2009 Mat Booth <fedora at matbooth.co.uk> 1.7.0-2
- Build all features.
- Add dependency on LPG.


eclipse-dtp-remove-duplicate-plugin.patch:

--- NEW FILE eclipse-dtp-remove-duplicate-plugin.patch ---
--- org.eclipse.datatools.sqldevtools.feature/feature.xml	2009-04-24 10:39:24.000000000 +0100
+++ org.eclipse.datatools.sqldevtools.feature/feature.xml	2009-07-05 21:56:31.156615551 +0100
@@ -118,13 +118,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.datatools.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.datatools.sqltools.db.generic"
          download-size="0"
          install-size="0"
--- org.eclipse.datatools.sqldevtools.results.feature/feature.xml	2008-11-14 06:30:00.000000000 +0000
+++ org.eclipse.datatools.sqldevtools.results.feature/feature.xml	2009-07-06 22:42:45.189007201 +0100
@@ -39,11 +39,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.datatools.connectivity"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>


Index: eclipse-dtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-dtp/devel/eclipse-dtp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- eclipse-dtp.spec	2 Jul 2009 20:00:40 -0000	1.7
+++ eclipse-dtp.spec	14 Jul 2009 22:11:21 -0000	1.8
@@ -1,9 +1,13 @@
 %global eclipse_base     %{_libdir}/eclipse
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
 
+# temporarily disable jar repacking because of a bug in redhat-rpm-config, see:
+# https://bugzilla.redhat.com/show_bug.cgi?id=461854
+%define __jar_repack %{nil}
+
 Name:      eclipse-dtp
 Version:   1.7.0
-Release:   1%{?dist}
+Release:   3%{?dist}
 Summary:   Eclipse Data Tools Platform
 Group:     System Environment/Libraries
 License:   EPL
@@ -17,6 +21,10 @@ Source1:   get-dtp.sh
 
 Patch0:    %{name}-java6.patch
 
+# remove duplicate plugin from sqltools features (it's actually built in the
+# connectivity feature)
+Patch1:    %{name}-remove-duplicate-plugin.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:        noarch
@@ -26,22 +34,24 @@ BuildRequires:    jpackage-utils
 BuildRequires:    eclipse-pde >= 1:3.4.2
 BuildRequires:    eclipse-emf
 BuildRequires:    eclipse-gef
-BuildRequires:    wsdl4j >= 1.5.2-5.5
+BuildRequires:    wsdl4j >= 1.5.2-6.6
 BuildRequires:    xerces-j2 >= 2.7.1-10.3
 BuildRequires:    xml-commons-resolver >= 1.1-2.15
 BuildRequires:    xalan-j2 >= 2.7.0-7.5
 BuildRequires:    xml-commons-apis >= 1.3.04-1.4
+BuildRequires:    lpg-java-compat = 1.1.0
 
 Requires:         java 
 Requires:         jpackage-utils
 Requires:         eclipse-platform >= 1:3.4.2
 Requires:         eclipse-emf
 Requires:         eclipse-gef
-Requires:         wsdl4j >= 1.5.2-5.5
+Requires:         wsdl4j >= 1.5.2-6.6
 Requires:         xerces-j2 >= 2.7.1-10.3
 Requires:         xml-commons-resolver >= 1.1-2.15
 Requires:         xalan-j2 >= 2.7.0-7.5
 Requires:         xml-commons-apis >= 1.3.04-1.4
+Requires:         lpg-java-compat = 1.1.0
 
 %description
 The Eclipse Data Tools Platform provides extensible frameworks and exemplary 
@@ -50,11 +60,10 @@ data-centric technologies and supported 
 
 %prep
 %setup -q -n dtp-%{version}
-%patch0
 
-# remove unneeded import on sun.misc.Compare which broke compilation on non-Sun jvm
-sed -i 's/import sun\.misc\.Compare;/ /' \
- org.eclipse.datatools.connectivity/src/org/eclipse/datatools/connectivity/drivers/models/OverrideTemplateDescriptor.java
+# apply patches
+%patch0
+%patch1
 
 # make sure upstream hasn't sneaked in any jars we don't know about
 JARS=""
@@ -75,37 +84,48 @@ ln -s %{_javadir}/xalan-j2-serializer.ja
 ln -s %{_javadir}/xml-commons-resolver.jar org.apache.xml.resolver_1.2.0.jar
 ln -s %{_javadir}/xml-commons-apis.jar javax.xml_1.3.4.jar
 ln -s %{_javadir}/wsdl4j.jar javax.wsdl_1.5.0.jar
+ln -s %{_javadir}/lpgjavaruntime.jar net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
 popd
 
 %build
-# build a subset of the features until dependencies and build issues are fixed
+# Note: Use date from the cvs tag as the context qualifier.
+OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v200906151043"
+
+# build all features except for documentation and SDK features TODO: build everything
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.datatools.modelbase.feature \
-  -d "emf gef" -o `pwd`/orbitDeps
+  -d "emf gef" -o `pwd`/orbitDeps -a "$OPTIONS"
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.datatools.connectivity.feature \
-  -d "emf gef" -o `pwd`/orbitDeps 
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.datatools.enablement.oda.feature \
-  -d "emf gef" -o `pwd`/orbitDeps
+  -d "emf gef" -o `pwd`/orbitDeps -a "$OPTIONS"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.datatools.sqldevtools.feature \
+  -d "emf gef" -o `pwd`/orbitDeps -a "$OPTIONS"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.datatools.enablement.feature \
+  -d "emf gef" -o `pwd`/orbitDeps -a "$OPTIONS"
 
 %install
 rm -rf %{buildroot}
 install -d -m 755 %{buildroot}%{eclipse_dropin}
 unzip -q -d %{buildroot}%{eclipse_dropin}/dtp-modelbase build/rpmBuild/org.eclipse.datatools.modelbase.feature.zip
 unzip -q -d %{buildroot}%{eclipse_dropin}/dtp-connectivity build/rpmBuild/org.eclipse.datatools.connectivity.feature.zip
-unzip -q -d %{buildroot}%{eclipse_dropin}/dtp-enablement-oda build/rpmBuild/org.eclipse.datatools.enablement.oda.feature.zip
+unzip -q -d %{buildroot}%{eclipse_dropin}/dtp-sqldevtools build/rpmBuild/org.eclipse.datatools.sqldevtools.feature.zip
+unzip -q -d %{buildroot}%{eclipse_dropin}/dtp-enablement build/rpmBuild/org.eclipse.datatools.enablement.feature.zip
 
 # use system bundles
-pushd %{buildroot}%{eclipse_dropin}/dtp-enablement-oda/eclipse/plugins
-rm -fr org.apache.xerces_*.jar
+pushd %{buildroot}%{eclipse_dropin}/dtp-enablement/eclipse/plugins
+rm org.apache.xerces_*.jar
 ln -s ../../../../../java/xerces-j2.jar org.apache.xerces_2.9.0.jar
-rm -fr org.apache.xml.serializer_*.jar
+rm org.apache.xml.serializer_*.jar
 ln -s ../../../../../java/xalan-j2-serializer.jar org.apache.xml.serializer_2.7.1.jar
-rm -fr org.apache.xml.resolver_*.jar
+rm org.apache.xml.resolver_*.jar
 ln -s ../../../../../java/xml-commons-resolver.jar org.apache.xml.resolver_1.2.0.jar
-rm -fr javax.xml_*.jar
+rm javax.xml_*.jar
 ln -s ../../../../../java/xml-commons-apis.jar javax.xml_1.3.4.jar
-rm -fr javax.wsdl_*.jar
+rm javax.wsdl_*.jar
 ln -s ../../../../../java/wsdl4j.jar javax.wsdl_1.5.0.jar
 popd
+pushd %{buildroot}%{eclipse_dropin}/dtp-sqldevtools/eclipse/plugins
+rm net.sourceforge.lpg.lpgjavaruntime_*.jar
+ln -s ../../../../../java/lpgjavaruntime.jar net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
+popd
 
 %clean
 rm -rf %{buildroot}
@@ -114,10 +134,19 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{eclipse_dropin}/dtp-modelbase
 %{eclipse_dropin}/dtp-connectivity
-%{eclipse_dropin}/dtp-enablement-oda
-%doc org.eclipse.datatools.enablement.oda.feature/license.html
+%{eclipse_dropin}/dtp-sqldevtools
+%{eclipse_dropin}/dtp-enablement
+%doc org.eclipse.datatools.sdk-all.feature/rootfiles/*
 
 %changelog
+* Tue Jul 14 2009 Mat Booth <fedora at matbooth.co.uk> 1.7.0-3
+- Disable jar repacking because of a bug in redhat-rpm-config, see #461854.
+- Update dependency on wsdl4j.
+
+* Sun Jul 05 2009 Mat Booth <fedora at matbooth.co.uk> 1.7.0-2
+- Build all features.
+- Add dependency on LPG.
+
 * Thu Jul 02 2009 Mat Booth <fedora at matbooth.co.uk> 1.7.0-1
 - Update to 1.7.0 final release (Galileo).
 - Get map files from CVS instead of maintaining our own.