rpms/eclipse-mylyn/devel eclipse-mylyn.spec, 1.29, 1.30 eclipse-mylyn-addfedoracustomizations.patch, 1.5, 1.6

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32389/devel

Modified Files:
	eclipse-mylyn.spec eclipse-mylyn-addfedoracustomizations.patch 
Log Message:
Rebase addfedoracustomizations.patch.


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- eclipse-mylyn.spec	21 Oct 2008 11:17:45 -0000	1.29
+++ eclipse-mylyn.spec	21 Oct 2008 11:48:37 -0000	1.30
@@ -146,7 +146,7 @@
 #org.apache.axis_1.4.0.v200806030120.zip,unpack=true
 #org.apache.commons.discovery_0.2.0.v200806030120.zip,unpack=true
 
-%patch6 -p0
+%patch6 -p0 -b .withfedoracustomizations
 pushd org.fedoraproject.mylyn.bugzilla
 %patch9
 popd
@@ -298,6 +298,7 @@
 %changelog
 * Tue Oct 21 2008 Alexander Kurtakov <akurtako at redhat.com> 3.0.3-1
 - 3.0.3.
+- Rebase addfedoracustomizations.patch.
 
 * Sat Oct 18 2008 Alexander Kurtakov <akurtako at redhat.com> 3.0.1-3
 - Add >= for jdom to ensure proper OSGi metadata

eclipse-mylyn-addfedoracustomizations.patch:

Index: eclipse-mylyn-addfedoracustomizations.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn-addfedoracustomizations.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-mylyn-addfedoracustomizations.patch	8 Aug 2008 12:12:03 -0000	1.5
+++ eclipse-mylyn-addfedoracustomizations.patch	21 Oct 2008 11:48:37 -0000	1.6
@@ -1,8 +1,8 @@
 diff -up ./org.eclipse.mylyn.bugzilla-feature/feature.xml.withfedoracustomizations ./org.eclipse.mylyn.bugzilla-feature/feature.xml
---- ./org.eclipse.mylyn.bugzilla-feature/feature.xml.withfedoracustomizations	2008-08-08 08:05:12.000000000 -0400
-+++ ./org.eclipse.mylyn.bugzilla-feature/feature.xml	2008-08-08 08:05:56.000000000 -0400
+--- ./org.eclipse.mylyn.bugzilla-feature/feature.xml.withfedoracustomizations	2008-10-01 23:06:51.000000000 +0200
++++ ./org.eclipse.mylyn.bugzilla-feature/feature.xml	2008-10-21 13:46:09.000000000 +0200
 @@ -96,4 +96,11 @@ Java and all Java-based trademarks are t
-          version="3.0.1.qualifier"
+          version="3.0.3.qualifier"
           unpack="false"/>
  
 +   <plugin