rpms/eclipse/devel eclipse-pdebuild.sh, 1.7, 1.8 eclipse.spec, 1.593, 1.594

[Alexander Kurtakov]

Author: akurtakov

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

Modified Files:
	eclipse-pdebuild.sh eclipse.spec 
Log Message:
- Remove dropins contents while running initializer.
- Resolves #466476. Fix pdebuild script. Jeff Johnston


Index: eclipse-pdebuild.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-pdebuild.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-pdebuild.sh	27 Aug 2008 20:12:34 -0000	1.7
+++ eclipse-pdebuild.sh	14 Oct 2008 08:18:32 -0000	1.8
@@ -205,13 +205,13 @@
 fi
 
 if [ $testing != true ]; then
-  p2Generate="-Dp2.root.name=\"$featureName\" \
--Dp2.root.version=\"$featureVersion\" \
--Dgenerate.p2.metadata=true \
--Dp2.metadata.repo=file:$buildDir/repo \
--Dp2.artifact.repo=file:$buildDir/repo \
--Dp2.flavor=tooling \
--Dp2.publish.artifacts=true"
+  p2Generate="-Dp2.root.name=\"$featureName\"" \
+" -Dp2.root.version=\"$featureVersion\"" \
+" -Dgenerate.p2.metadata=true" \
+" -Dp2.metadata.repo=file:$buildDir/repo" \
+" -Dp2.artifact.repo=file:$buildDir/repo" \
+" -Dp2.flavor=tooling" \
+" -Dp2.publish.artifacts=true"
 fi
 
 echo
@@ -268,4 +268,4 @@
   zip -r $featureId.zip eclipse
   rm -rf eclipse
   popd
-fi
+fi
\ No newline at end of file


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.593
retrieving revision 1.594
diff -u -r1.593 -r1.594
--- eclipse.spec	10 Oct 2008 13:15:09 -0000	1.593
+++ eclipse.spec	14 Oct 2008 08:18:32 -0000	1.594
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1%{?dist} 
+Release:        3%{?dist} 
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -977,6 +977,8 @@
 # Extract .so files
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
 pushd $RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT/usr/lib/eclipse/dropins  $RPM_BUILD_ROOT/dropins
+mkdir $RPM_BUILD_ROOT/usr/lib/eclipse/dropins
 libdir_path=$(echo %{_libdir}/%{name} | sed -e 's/^\///')
 java -Dosgi.sharedConfiguration.area=$libdir_path/configuration \
      -cp $libdir_path/startup.jar \
@@ -985,6 +987,8 @@
      -application org.eclipse.equinox.initializer.configInitializer \
      -fileInitializer %{SOURCE19}
 popd
+rm -fr $RPM_BUILD_ROOT/usr/lib/eclipse/dropins
+mv $RPM_BUILD_ROOT/dropins $RPM_BUILD_ROOT/usr/lib/eclipse/dropins
 
 # Remove the unnecessary configuration data
 rm -r $sdkDir/configuration/org.eclipse.update
@@ -1503,9 +1507,16 @@
 %{_libdir}/%{name}/buildscripts
 %{_libdir}/%{name}/dropins/sdk
 # FIXME:  where should this go?
-%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
+#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Oct 13 2008 Alexander Kurtakov <akurtako at redhat.com> 3.4.1-3
+- Remove dropins contents while running initializer.
+
+* Fri Oct 10 2008 Jeff Johnston <jjohnstn at redhat.com> 3.4.1-2
+- Resolves #466476
+- Fix pdebuild script.
+
 * Fri Oct 03 2008 Andrew Overholt <overholt at redhat.com> 3.4.1-1
 - Symlink to ant-apache-bsf and ant-commons-net.
 - Update branding.