rpms/eclipse-subclipse/EL-5 subclipse-fetch-1.2.4.sh, NONE, 1.1 .cvsignore, 1.5, 1.6 eclipse-subclipse-1.2.2-plugin-classpath.patch, 1.1, 1.2 eclipse-subclipse.spec, 1.5, 1.6 sources, 1.5, 1.6 subclipse-fetch-1.2.2.sh, 1.1, NONE
Robert Marcano (robmv)
fedora-extras-commits at redhat.com
Wed Sep 19 16:58:04 UTC 2007
Author: robmv
Update of /cvs/extras/rpms/eclipse-subclipse/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4150
Modified Files:
.cvsignore eclipse-subclipse-1.2.2-plugin-classpath.patch
eclipse-subclipse.spec sources
Added Files:
subclipse-fetch-1.2.4.sh
Removed Files:
subclipse-fetch-1.2.2.sh
Log Message:
- Fix wrong applied classpath patch, fixing error: An error occurred while
automatically activating bundle org.tigris.subversion.subclipse.core
- Update to upstream 1.2.4
- Build for all supported arquitectures
- Change MANIFEST.MF patch to be applied on prep stage
--- NEW FILE subclipse-fetch-1.2.4.sh ---
#!/bin/sh
VERSION=1.2.4
svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION
find $VERSION -name \*.dll | xargs rm
mv $VERSION subclipse-$VERSION
tar -czf subclipse-$VERSION.tgz subclipse-$VERSION
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 20 Jun 2007 18:25:12 -0000 1.5
+++ .cvsignore 19 Sep 2007 16:57:31 -0000 1.6
@@ -1 +1 @@
-subclipse-1.2.2.tgz
+subclipse-1.2.4.tgz
eclipse-subclipse-1.2.2-plugin-classpath.patch:
Index: eclipse-subclipse-1.2.2-plugin-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/EL-5/eclipse-subclipse-1.2.2-plugin-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-subclipse-1.2.2-plugin-classpath.patch 20 Jun 2007 18:25:12 -0000 1.1
+++ eclipse-subclipse-1.2.2-plugin-classpath.patch 19 Sep 2007 16:57:31 -0000 1.2
@@ -1,12 +1,10 @@
-diff -Naur subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF
---- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF 2006-10-23 13:10:29.000000000 -0400
-+++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF 2006-11-08 07:16:12.000000000 -0400
-@@ -2,7 +2,7 @@
- Bundle-Name: %pluginName
+--- subclipse-1.2.2.original/subclipse/core/META-INF/MANIFEST.MF 2007-06-09 16:05:49.000000000 -0400
++++ subclipse-1.2.2/subclipse/core/META-INF/MANIFEST.MF 2007-09-09 17:12:39.000000000 -0400
+@@ -3,6 +3,7 @@
Bundle-SymbolicName: org.tigris.subversion.subclipse.core; singleton:=true
Bundle-Version: 1.2.2
--Bundle-ClassPath: .,
-+Bundle-ClassPath: lib/subclipse-core.jar,
+ Bundle-ClassPath: .,
++ lib/subclipse-core.jar,
lib/svnClientAdapter.jar,
lib/svnjavahl.jar,
lib/svnkit.jar,
Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/EL-5/eclipse-subclipse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-subclipse.spec 20 Jun 2007 18:25:12 -0000 1.5
+++ eclipse-subclipse.spec 19 Sep 2007 16:57:31 -0000 1.6
@@ -15,7 +15,7 @@
Name: eclipse-subclipse
-Version: 1.2.2
+Version: 1.2.4
Release: 2%{?dist}
Summary: Subversion Eclipse plugin
@@ -26,14 +26,11 @@
# Script to fetch the source code
# the new source tarball does not includes the book feature and the layout is
# different than the source repository
-Source10: subclipse-fetch-1.2.2.sh
+Source10: subclipse-fetch-1.2.4.sh
# Disable javahl support temporaly until apparent classloader problem is fixed
Patch0: eclipse-subclipse-1.2.2-default-svnkit.patch
+Patch1: eclipse-subclipse-1.2.2-plugin-classpath.patch
-# This patch is applied after the build has finished when unpacking the plugin
-# jar and replacing internal jars with links to its dependencies. It can not be
-# applied at "prep" stage because it causes errors at build time
-Source50: eclipse-subclipse-1.2.2-plugin-classpath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant
@@ -50,7 +47,7 @@
%endif
%if %{gcj_support}
-ExclusiveArch: %{ix86} x86_64 ppc ia64
+#ExclusiveArch: %{ix86} x86_64 ppc ia64
%else
BuildArch: noarch
%endif
@@ -83,6 +80,7 @@
%if 0%{disable_javahl}
%patch -p1
%endif
+%patch1 -p1
# delete the jars that are in the archive
rm svnClientAdapter/lib/svnjavahl.jar
@@ -197,8 +195,6 @@
# packaging .class files as a jar file
jar -cf $RPM_BUILD_ROOT%{core_plugin_dir}/lib/subclipse-core.jar -C $RPM_BUILD_ROOT%{core_plugin_dir} org
rm -rf $RPM_BUILD_ROOT%{core_plugin_dir}/org
-# adding the recently created jar to the plugin manifestOB
-patch $RPM_BUILD_ROOT%{core_plugin_dir}/META-INF/MANIFEST.MF < %{SOURCE50}
# removing core plugin internal jars
rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar
@@ -242,6 +238,20 @@
%{eclipse_base}/plugins/org.tigris.subversion.book_*
%changelog
+* Wed Sep 19 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-2
+- Fix wrong applied classpath patch, fixing error: An error occurred while
+automatically activating bundle org.tigris.subversion.subclipse.core
+
+* Mon Sep 10 2007 Robert Marcano <robert at marcanoonline.com> 1.2.4-1
+- Update to upstream 1.2.4
+- Build for all supported arquitectures
+
+* Sun Sep 09 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-6
+- Change MANIFEST.MF patch to be applied on prep stage
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.2-4
+- Rebuild for selinux ppc32 issue.
+
* Wed Jun 20 2007 Robert Marcano <robert at marcanoonline.com> 1.2.2-2
- Update to upstream 1.2.2
- Dependency changed from javasvn to svnkit
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 20 Jun 2007 18:25:12 -0000 1.5
+++ sources 19 Sep 2007 16:57:31 -0000 1.6
@@ -1 +1 @@
-b58870a0a4ec9c5cacf3830bc3179961 subclipse-1.2.2.tgz
+3cc35428541a456db2614ce9b027fe8e subclipse-1.2.4.tgz
--- subclipse-fetch-1.2.2.sh DELETED ---
More information about the fedora-extras-commits
mailing list