diff --git a/.cvsignore b/.cvsignore index 83033af..9aa98d8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -6,3 +6,6 @@ eclipse-sourceBuild-srcIncluded-3.4.1.zip eclipse-3.4.1-testframework.tar.bz2 org.fedoraproject.ide.platform-3.4.1.zip pre320changelog.txt +eclipse-sourceBuild-srcIncluded-3.4.2.zip +eclipse-3.4.2-testframework.tar.bz2 +org.fedoraproject.ide.platform-3.4.2.zip diff --git a/eclipse-add-ppc64-sparc64-s390-s390x-2.patch b/eclipse-add-ppc64-sparc64-s390-s390x-2.patch index d95ca92..4509929 100644 --- a/eclipse-add-ppc64-sparc64-s390-s390x-2.patch +++ b/eclipse-add-ppc64-sparc64-s390-s390x-2.patch @@ -56,13 +56,13 @@ diff -up ./features/org.eclipse.rcp.source/feature.xml.arches ./features/org.ecl --- ./features/org.eclipse.rcp.source/feature.xml.arches 2008-10-03 09:05:08.000000000 -0400 +++ ./features/org.eclipse.rcp.source/feature.xml 2008-10-03 09:07:51.000000000 -0400 @@ -45,6 +45,10 @@ - - + + -+ -+ -+ -+ - - - ++ ++ ++ ++ + + + diff --git a/eclipse-addfragmentsforotherplatforms.patch b/eclipse-addfragmentsforotherplatforms.patch index f76e653..b8db6c0 100644 --- a/eclipse-addfragmentsforotherplatforms.patch +++ b/eclipse-addfragmentsforotherplatforms.patch @@ -2,11 +2,11 @@ diff -up ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml.fragments ./assemble.org --- ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml.fragments 2008-10-03 08:59:56.000000000 -0400 +++ ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml 2008-10-03 09:02:46.000000000 -0400 @@ -184,6 +184,7 @@ - + - + + - + @@ -795,6 +796,10 @@ @@ -17,6 +17,6 @@ diff -up ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml.fragments ./assemble.org + + + - + diff --git a/eclipse.spec b/eclipse.spec index 0100baa..13bf29b 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -10,8 +10,8 @@ Epoch: 1 %define eclipse_major 3 %define eclipse_minor 4 %define eclipse_majmin %{eclipse_major}.%{eclipse_minor} -%define eclipse_micro 1 -%define swtver 3.4.1.v3449c +%define eclipse_micro 2 +%define swtver 3.4.1.v3452b %define initialize 1 # All arches line up between Eclipse and Linux kernel names except i386 -> x86 @@ -30,17 +30,17 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 16%{?dist} +Release: 1%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ -Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.4.1-200809111700/eclipse-sourceBuild-srcIncluded-3.4.1.zip +Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.4.2-200902111700/eclipse-sourceBuild-srcIncluded-3.4.2.zip Source2: %{name}.desktop #Source3: eclipse.in # cvs -d :pserver:anonymous@sources.redhat.com:/cvs/eclipse export \ -# -r fedoraeclipse-3_4_1 branding/org.fedoraproject.ide.platform +# -r fedoraeclipse-3_4_2 branding/org.fedoraproject.ide.platform # cd branding -# zip -r org.fedoraproject.ide.platform-3.4.1.zip \ +# zip -r org.fedoraproject.ide.platform-3.4.2.zip \ # org.fedoraproject.ide.platform Source4: org.fedoraproject.ide.platform-%{version}.zip # cvs -d :pserver:anonymous@sources.redhat.com:/cvs/eclipse export \ @@ -514,8 +514,8 @@ popd # Symlinks rm plugins/org.sat4j* -ln -s %{_javadir}/org.sat4j.core_* plugins/ -ln -s %{_javadir}/org.sat4j.pb_* plugins/ +ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.0.3.v20081021.jar +ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.0.3.v20081021.jar ASMPLUGINVERSION=$(ls plugins | grep org.objectweb.asm_ | \ sed 's/org.objectweb.asm_//') @@ -1176,8 +1176,8 @@ sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \ pushd $RPM_BUILD_ROOT%{_libdir}/%{name} rm plugins/org.sat4j* -ln -s %{_javadir}/org.sat4j.core_* plugins/ -ln -s %{_javadir}/org.sat4j.pb_* plugins/ +ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.0.3.v20081021.jar +ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.0.3.v20081021.jar ASMPLUGINVERSION=$(ls dropins/sdk/plugins | grep org.objectweb.asm_ | \ sed 's/org.objectweb.asm_//') @@ -1568,6 +1568,9 @@ fi #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Thu Feb 26 2009 Alexander Kurtakov 1:3.4.2-1 +- Update to 3.4.2. + * Tue Feb 24 2009 Fedora Release Engineering - 1:3.4.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index de5097d..105b91e 100644 --- a/sources +++ b/sources @@ -2,6 +2,6 @@ 43c2aa722a815c61706549d28786d134 eclipse-ecj-gcj.tar.bz2 e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2 28c8d625ea1af348cfc592369d52284c org.fedoraproject.ide.feature-1.0.0.zip -5814fb2019f70f00c0952f29df1cac3d eclipse-sourceBuild-srcIncluded-3.4.1.zip -12f447b8b8df93ac2f4d97adb61c5c6f eclipse-3.4.1-testframework.tar.bz2 -8dee24cd7db8bf1392768ccd4964aac1 org.fedoraproject.ide.platform-3.4.1.zip +bfbbf287cf57108b5eb6974be188c24f eclipse-sourceBuild-srcIncluded-3.4.2.zip +3e031f11b0de3f15b00233deec2b19f3 eclipse-3.4.2-testframework.tar.bz2 +c36f10cac0ab63f5da28e07a6b1bae9f org.fedoraproject.ide.platform-3.4.2.zip