rpms/eclipse-mylyn/devel eclipse-mylyn-webcorejar.patch, 1.2, 1.3 fetch-mylyn.sh, 1.2, 1.3 eclipse-mylyn.spec, 1.12, 1.13 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4

Andrew Overholt (overholt) fedora-extras-commits at redhat.com
Thu Oct 25 13:45:29 UTC 2007


Author: overholt

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20130/devel

Modified Files:
	eclipse-mylyn-webcorejar.patch fetch-mylyn.sh 
	eclipse-mylyn.spec .cvsignore sources 
Log Message:
Minor specfile tweaks.  Update webcore patch.

eclipse-mylyn-webcorejar.patch:

Index: eclipse-mylyn-webcorejar.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn-webcorejar.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-mylyn-webcorejar.patch	24 Oct 2007 22:09:37 -0000	1.2
+++ eclipse-mylyn-webcorejar.patch	25 Oct 2007 13:45:25 -0000	1.3
@@ -6,8 +6,16 @@
 retrieving revision 1.4
 diff -u -r1.4 .classpath
 --- .classpath	20 Sep 2007 04:30:29 -0000	1.4
-+++ .classpath	24 Oct 2007 21:50:26 -0000
-@@ -8,7 +8,6 @@
++++ .classpath	25 Oct 2007 13:17:14 -0000
+@@ -1,6 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <classpath>
+ 	<classpathentry kind="src" path="src"/>
++	<classpathentry exported="true" kind="lib" path="mylyn-webcore.jar"/>
+ 	<classpathentry exported="true" kind="lib" path="lib-httpclient/commons-httpclient-3.0.1.jar" sourcepath="lib-httpclient/commons-httpclient-3.0.1-src.zip"/>
+ 	<classpathentry exported="true" kind="lib" path="lib-httpclient/commons-codec-1.3.jar" sourcepath="lib-httpclient/commons-codec-1.3-src.zip"/>
+ 	<classpathentry exported="true" kind="lib" path="lib-httpclient/commons-logging-1.0.4.jar"/>
+@@ -8,7 +9,6 @@
  	<classpathentry exported="true" kind="lib" path="lib-xmlrpc/xmlrpc-client-3.0.jar" sourcepath="lib-xmlrpc/xmlrpc-client-3.0-sources.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib-xmlrpc/xmlrpc-common-3.0.jar" sourcepath="lib-xmlrpc/xmlrpc-common-3.0-sources.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib-xmlrpc/ws-commons-util-1.0.1.jar" sourcepath="lib-xmlrpc/ws-commons-util-1.0.1-sources.jar"/>
@@ -21,25 +29,28 @@
 retrieving revision 1.4
 diff -u -r1.4 build.properties
 --- build.properties	5 Jul 2007 04:31:25 -0000	1.4
-+++ build.properties	24 Oct 2007 21:50:26 -0000
-@@ -5,8 +5,8 @@
++++ build.properties	25 Oct 2007 13:17:14 -0000
+@@ -5,10 +5,10 @@
  # which accompanies this distribution, and is available at
  # http://www.eclipse.org/legal/epl-v10.html
  ###############################################################################
 -source.. = src/
 -output.. = bin/
 +source.mylyn-webcore.jar = src/
-+output.mylyn-webcore.jar = src/
++output.mylyn-webcore.jar = bin/
  bin.includes = META-INF/,\
-                .,\
+-               .,\
++               mylyn-webcore.jar,\
                 lib-xmlrpc/,\
+                lib-rome/,\
+                lib-httpclient/,\
 Index: META-INF/MANIFEST.MF
 ===================================================================
 RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.web.core/META-INF/MANIFEST.MF,v
 retrieving revision 1.44
 diff -u -r1.44 MANIFEST.MF
 --- META-INF/MANIFEST.MF	27 Sep 2007 17:00:26 -0000	1.44
-+++ META-INF/MANIFEST.MF	24 Oct 2007 21:50:26 -0000
++++ META-INF/MANIFEST.MF	25 Oct 2007 13:17:14 -0000
 @@ -8,29 +8,15 @@
  Bundle-RequiredExecutionEnvironment: J2SE-1.5
  Require-Bundle: org.eclipse.core.runtime,


Index: fetch-mylyn.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/fetch-mylyn.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fetch-mylyn.sh	24 Oct 2007 22:09:37 -0000	1.2
+++ fetch-mylyn.sh	25 Oct 2007 13:45:25 -0000	1.3
@@ -21,10 +21,6 @@
 org.eclipse.mylyn.java.ui \
 org.eclipse.mylyn.java.tests \
 org.eclipse.mylyn.java-feature \
-org.eclipse.mylyn.jira-feature \
-org.eclipse.mylyn.jira.core \
-org.eclipse.mylyn.jira.tests \
-org.eclipse.mylyn.jira.ui \
 org.eclipse.mylyn.monitor.core \
 org.eclipse.mylyn.monitor.ui \
 org.eclipse.mylyn.monitor.tests \


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- eclipse-mylyn.spec	24 Oct 2007 22:09:37 -0000	1.12
+++ eclipse-mylyn.spec	25 Oct 2007 13:45:25 -0000	1.13
@@ -23,7 +23,7 @@
 Patch4: %{name}-unpackwebcore.patch
 Patch5: %{name}-webcorejar.patch
 Patch6: %{name}-addfedoracustomizations.patch
-Patch7: %{name}-pdeui-idocumentationattributerename.patch
+Patch7: %{name}-pdeui-idocumentattributerename.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -136,11 +136,13 @@
 
 # FIXME:  talk to upstream about this (and tagging in general)
 pushd org.eclipse.mylyn.pde.ui
-%patch8
+%patch7
 popd
 
 # So we can symlink to dependencies
+pushd org.eclipse.mylyn-feature
 %patch4
+popd
 
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
 mkdir home


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Sep 2007 22:32:20 -0000	1.3
+++ .cvsignore	25 Oct 2007 13:45:25 -0000	1.4
@@ -1,2 +1,3 @@
-org.eclipse.mylyn-R_2_0_0-fetched-src.tar.bz2
-fedoraeclipse-mylynbugzilla-0.0.1.zip
+fedoraeclipse-mylynbugzilla-0.0.2.zip
+org.eclipse.mylyn-R_2_1_0-fetched-src.tar.bz2
+org.eclipse.mylyn


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Sep 2007 22:32:20 -0000	1.3
+++ sources	25 Oct 2007 13:45:25 -0000	1.4
@@ -1,2 +1,2 @@
-d78a53cf41bb98ccffe7ed5307c146ee  org.eclipse.mylyn-R_2_0_0-fetched-src.tar.bz2
-91ddb27b37165f94622e18964e3d6717  fedoraeclipse-mylynbugzilla-0.0.1.zip
+9bb866cc22d0cdca66074b2aaafb4825  fedoraeclipse-mylynbugzilla-0.0.2.zip
+9854dac15aa800dce0b942a404d258d7  org.eclipse.mylyn-R_2_1_0-fetched-src.tar.bz2




More information about the fedora-extras-commits mailing list