commit eclipse

29 Nov 2008

Hello community,

here is the log from the commit of package eclipse
checked in at Sat Nov 29 23:52:50 CET 2008.


--------

--- eclipse/eclipse-archdep.changes	2008-09-17 02:13:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/eclipse/eclipse-archdep.changes	2008-11-27 17:31:37.000000000 +0100
@@ -2 +2,15 @@
-Wed Sep 17 02:12:58 CEST 2008 - ro@suse.de
+Thu Nov 27 17:29:40 CET 2008 - mvyskocil@suse.cz
+
+- hotfix for bnc#436894 - eclipse: Software Updates cannot start
+  - added a %%{eclipsehome}/p2 directory from original tarball
+  - added a p2 location to config.ini
+- leave eclipse-archdep.spec and .changes generated by rpmbuild forever
+
+-------------------------------------------------------------------
+Tue Sep 23 16:47:58 CEST 2008 - anosek@suse.cz
+
+- fixed Eclipse won't start without extra user install (bnc#359321)
+  - added Requires: java-devel >= 1.6.0
+
+-------------------------------------------------------------------
+Wed Sep 17 02:12:43 CEST 2008 - ro@suse.de
--- eclipse/eclipse.changes	2008-09-23 16:48:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/eclipse/eclipse.changes	2008-11-27 17:31:37.000000000 +0100
@@ -1,0 +2,8 @@
+Thu Nov 27 17:29:40 CET 2008 - mvyskocil@suse.cz
+
+- hotfix for bnc#436894 - eclipse: Software Updates cannot start
+  - added a %%{eclipsehome}/p2 directory from original tarball
+  - added a p2 location to config.ini
+- leave eclipse-archdep.spec and .changes generated by rpmbuild forever
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  minmem

New:
----
  eclipse-p2-3.4.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ecj-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.R20330/_old	2008-11-29 23:52:21.000000000 +0100
+++ /var/tmp/diff_new_pack.R20330/_new	2008-11-29 23:52:21.000000000 +0100
@@ -27,7 +27,7 @@
 AutoReqProv:    on
 Summary:        Eclipse Java Compiler
 Version:        0.755
-Release:        165
+Release:        166
 Url:            http//www.eclipse.org
 Group:          Development/Libraries/Java
 Source0:        eclipse-sourceBuild-srcIncluded-%{eclipse_version}.tar.bz2

++++++ eclipse-archdep.spec ++++++
--- /var/tmp/diff_new_pack.R20330/_old	2008-11-29 23:52:21.000000000 +0100
+++ /var/tmp/diff_new_pack.R20330/_new	2008-11-29 23:52:21.000000000 +0100
@@ -21,6 +21,8 @@
 %define build_archdep 1
 
 Name:           eclipse-archdep
+# This line is not a comment, please do not remove it!
+#%(sh %{_sourcedir}/eclipse-prepare.sh %{_sourcedir} %{name})
 %if %build_archdep
 # no versions for s390, s390x and ppc64 available!
 # disabled ia64 until 1.5.0 Java on ia64 available
@@ -47,7 +49,7 @@
 %define eclipsehome     %{_datadir}/%{orig_name}
 Summary:        Eclipse Platform and Java IDE
 Version:        3.4
-Release:        4
+Release:        5
 License:        Any permissive; Eclipse Public License, see http://www.eclipse.org/legal/
 Group:          Development/Tools/IDE
 Url:            http://www.eclipse.org
@@ -71,13 +73,16 @@
 NoSource:       52
 Source53:       eclipse-prepare.sh
 NoSource:       53
+# comes from original eclipse tarball
+# as a hotfix for bnc#436894
+Source100:      eclipse-p2-3.4.tar.bz2
 Patch:          eclipse-%{version}-fix_build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %build_archdep
 %define debug_package_requires eclipse-archdep-platform = %{version}-%{release}
 %endif
 %if ! %build_archdep
-Requires:       java >= 1.6.0
+Requires:       java-devel >= 1.6.0
 Recommends:     %{orig_name}-jdt = %{version}
 Recommends:     %{orig_name}-pde = %{version}
 Requires:       %{orig_name}-platform = %{version}
@@ -323,6 +328,10 @@
   mv $file $RPM_BUILD_ROOT/%{_libdir}/%{orig_name}/$file; 
   ln -sf   %{_libdir}/%{orig_name}/$file $file
 done 
+# bnc#436894 hotfix
+tar -xf %{SOURCE100} -C $RPM_BUILD_ROOT/%{eclipsehome}
+echo "eclipse.p2.data.area=/usr/share/eclipse/p2" >> $RPM_BUILD_ROOT/%{eclipsehome}/configuration/config.ini
+echo "eclipse.p2.profile=PlatformProfile"         >> $RPM_BUILD_ROOT/%{eclipsehome}/configuration/config.ini
 # eclipse wrapper script
 mv eclipse eclipse.bin
 STARTUP_JAR=$( find . -name 'org.eclipse.equinox.launcher_*.jar' )
@@ -350,6 +359,8 @@
 %else
 
 %files -f source20+archdep-exclude.files
+%defattr(-,root,root,0755)
+%{eclipsehome}/p2/*
 
 %files jdt -f %{SOURCE21}
 
@@ -361,6 +372,14 @@
 %endif
 
 %changelog
+* Thu Nov 27 2008 mvyskocil@suse.cz
+- hotfix for bnc#436894 - eclipse: Software Updates cannot start
+  - added a %%{eclipsehome}/p2 directory from original tarball
+  - added a p2 location to config.ini
+- leave eclipse-archdep.spec and .changes generated by rpmbuild forever
+* Tue Sep 23 2008 anosek@suse.cz
+- fixed Eclipse won't start without extra user install (bnc#359321)
+  - added Requires: java-devel >= 1.6.0
 * Wed Sep 17 2008 ro@suse.de
 - fix debug requires for eclipse-archdep
 * Fri Aug 29 2008 anosek@suse.cz
@@ -389,7 +408,7 @@
 - Removed bogus dependency on mDNSResponder.
 * Thu Sep 13 2007 skh@suse.de
 - Require jre1.6.x for eclipse-platform [#305452]
-* Wed Jun 27 2007 dbornkessel@suse.de
+* Tue Jun 26 2007 dbornkessel@suse.de
 - update to the next milestone 3.3RC4
 * Mon Jun 11 2007 dbornkessel@suse.de
 - removed VMARGS from eclipse.conf (Bug #227263 )

++++++ eclipse.spec ++++++
--- /var/tmp/diff_new_pack.R20330/_old	2008-11-29 23:52:21.000000000 +0100
+++ /var/tmp/diff_new_pack.R20330/_new	2008-11-29 23:52:21.000000000 +0100
@@ -21,6 +21,8 @@
 %define build_archdep 0
 
 Name:           eclipse
+# This line is not a comment, please do not remove it!
+#%(sh %{_sourcedir}/eclipse-prepare.sh %{_sourcedir} %{name})
 %if %build_archdep
 # no versions for s390, s390x and ppc64 available!
 # disabled ia64 until 1.5.0 Java on ia64 available
@@ -47,7 +49,7 @@
 %define eclipsehome     %{_datadir}/%{orig_name}
 Summary:        Eclipse Platform and Java IDE
 Version:        3.4
-Release:        9
+Release:        10
 License:        Other uncritical OpenSource License; Eclipse Public License
 Group:          Development/Tools/IDE
 Url:            http://www.eclipse.org
@@ -71,6 +73,9 @@
 NoSource:       52
 Source53:       eclipse-prepare.sh
 NoSource:       53
+# comes from original eclipse tarball
+# as a hotfix for bnc#436894
+Source100:      eclipse-p2-3.4.tar.bz2
 Patch:          eclipse-%{version}-fix_build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %build_archdep
@@ -323,6 +328,10 @@
   mv $file $RPM_BUILD_ROOT/%{_libdir}/%{orig_name}/$file; 
   ln -sf   %{_libdir}/%{orig_name}/$file $file
 done 
+# bnc#436894 hotfix
+tar -xf %{SOURCE100} -C $RPM_BUILD_ROOT/%{eclipsehome}
+echo "eclipse.p2.data.area=/usr/share/eclipse/p2" >> $RPM_BUILD_ROOT/%{eclipsehome}/configuration/config.ini
+echo "eclipse.p2.profile=PlatformProfile"         >> $RPM_BUILD_ROOT/%{eclipsehome}/configuration/config.ini
 # eclipse wrapper script
 mv eclipse eclipse.bin
 STARTUP_JAR=$( find . -name 'org.eclipse.equinox.launcher_*.jar' )
@@ -350,6 +359,8 @@
 %else
 
 %files -f source20+archdep-exclude.files
+%defattr(-,root,root,0755)
+%{eclipsehome}/p2/*
 
 %files jdt -f %{SOURCE21}
 
@@ -361,6 +372,11 @@
 %endif
 
 %changelog
+* Thu Nov 27 2008 mvyskocil@suse.cz
+- hotfix for bnc#436894 - eclipse: Software Updates cannot start
+  - added a %%{eclipsehome}/p2 directory from original tarball
+  - added a p2 location to config.ini
+- leave eclipse-archdep.spec and .changes generated by rpmbuild forever
 * Tue Sep 23 2008 anosek@suse.cz
 - fixed Eclipse won't start without extra user install (bnc#359321)
   - added Requires: java-devel >= 1.6.0
@@ -392,7 +408,7 @@
 - Removed bogus dependency on mDNSResponder.
 * Thu Sep 13 2007 skh@suse.de
 - Require jre1.6.x for eclipse-platform [#305452]
-* Wed Jun 27 2007 dbornkessel@suse.de
+* Tue Jun 26 2007 dbornkessel@suse.de
 - update to the next milestone 3.3RC4
 * Mon Jun 11 2007 dbornkessel@suse.de
 - removed VMARGS from eclipse.conf (Bug #227263 )



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)