rpms/eclipse-subclipse/devel eclipse-subclipse-1.2.2-plugin-classpath.patch, 1.2, 1.3 eclipse-subclipse.spec, 1.8, 1.9

[Robert Marcano (robmv)]

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17533

Modified Files:
	eclipse-subclipse-1.2.2-plugin-classpath.patch 
	eclipse-subclipse.spec 
Log Message:
Change MANIFEST.MF patch to be applied on %prep stage


eclipse-subclipse-1.2.2-plugin-classpath.patch:

Index: eclipse-subclipse-1.2.2-plugin-classpath.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse-1.2.2-plugin-classpath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-subclipse-1.2.2-plugin-classpath.patch	9 Sep 2007 20:23:22 -0000	1.2
+++ eclipse-subclipse-1.2.2-plugin-classpath.patch	9 Sep 2007 21:40:55 -0000	1.3
@@ -1,13 +1,10 @@
---- MANIFEST.MF.original	2007-09-09 14:40:20.000000000 -0400
-+++ MANIFEST.MF	2007-09-09 14:42:09.000000000 -0400
-@@ -14,8 +14,8 @@
-  rg.tigris.subversion.svnclientadapter.commandline.parser,org.tigris.s
-  ubversion.svnclientadapter.javahl,org.tigris.subversion.svnclientadap
-  ter.svnkit,org.tigris.subversion.svnclientadapter.utils
--Bundle-ClassPath: .,lib/svnClientAdapter.jar,lib/svnjavahl.jar,lib/svn
-- kit.jar,lib/ganymed.jar
-+Bundle-ClassPath: lib/subclipse-core.jar,lib/svnClientAdapter.jar,lib/
-+ svnjavahl.jar,lib/svnkit.jar,lib/ganymed.jar
- Bundle-Name: %pluginName
- Bundle-Localization: plugin
- Bundle-RequiredExecutionEnvironment: J2SE-1.4
+--- 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: .,
++ lib/subclipse-core.jar,
+  lib/svnClientAdapter.jar,
+  lib/svnjavahl.jar,
+  lib/svnkit.jar,


Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-subclipse.spec	9 Sep 2007 20:23:22 -0000	1.8
+++ eclipse-subclipse.spec	9 Sep 2007 21:40:55 -0000	1.9
@@ -16,7 +16,7 @@
 
 Name:           eclipse-subclipse
 Version:        1.2.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -29,11 +29,8 @@
 Source10:       subclipse-fetch-1.2.2.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
@@ -82,6 +79,7 @@
 %setup -q -n subclipse-%{version}
 %if 0%{disable_javahl}
 %patch -p1
+%patch1 -p1
 %endif
 
 # delete the jars that are in the archive
@@ -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 manifest
-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,9 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* 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.