[eclipse-mylyn/f21: 2/2] Ensure the qualifier buildtimestamp is lexigraphically greater than upstream's

Fri Aug 15 14:50:52 UTC 2014

commit 2ee26455f7362025dfc53fefcd3bc45bf0f02767
Author: Mat Booth <mat.booth at redhat.com>
Date:   Fri Aug 15 13:24:04 2014 +0100

    Ensure the qualifier buildtimestamp is lexigraphically greater than upstream's
    
    - Fix guava being owned by more than one package
    - Fix broken symlinks for gson and jsoup

 .gitignore         |   15 +++------------
 eclipse-mylyn.spec |   35 +++++++++++++++++++++--------------
 2 files changed, 24 insertions(+), 26 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index a270d63..5a1b96a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,5 @@
-org.eclipse.mylyn-R_3_4_0-fetched-src.tar.bz2
-org.eclipse.mylyn-R_3_4_1-fetched-src.tar.bz2
-/org.eclipse.mylyn-R_3_4_2-fetched-src.tar.bz2
-eclipse-mylyn-R_3_5_0-fetched-src.tar.bz2
-eclipse-mylyn-R_3_5_1-fetched-src.tar.bz2
-eclipse-mylyn-R_3_6_0-fetched-src.tar.bz2
-eclipse-mylyn-R_3_6_2-fetched-src.tar.bz2
-eclipse-mylyn-R_3_6_3-fetched-src.tar.bz2
-eclipse-mylyn-R_3_6_4-fetched-src.tar.bz2
-eclipse-mylyn-R_3_7_0-fetched-src.tar.bz2
-/eclipse-mylyn-R_3_7_0-fetched-src
 /noarch
+/*.src.rpm
 /.project
 org.eclipse.core.runtime.compatibility.auth.tar.bz2
 eclipse-mylyn-R_3_8_0-fetched-src.tar.bz2
@@ -45,4 +35,5 @@ eclipse-mylyn-R_3_8_1-fetched-src.tar.bz2
 /eclipse-mylyn-c94b24d5c1bfda43bf5782ce142ecf3e890beda8-incubator-fetched-src.tar.xz
 /eclipse-mylyn-8c077e351de3d0857512e7c4e48ad0f0a56e96ca-fetched-src.tar.xz
 /eclipse-mylyn-a1a4646ea6d027e89f828a9c45bd8fa79721a90c-incubator-fetched-src.tar.xz
-/eclipse-mylyn-R_3_12_0-fetched-src.tar.xz
+/eclipse-mylyn-*-fetched-src.tar.xz
+/eclipse-mylyn-*-fetched-src/
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index 02feb40..6904449 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -3,7 +3,7 @@
 
 %global install_loc         %{_datadir}/eclipse/dropins
 %global tag R_3_12_0
-%global incubator_tag 	a1a4646ea6d027e89f828a9c45bd8fa79721a90c
+%global incubator_tag a1a4646ea6d027e89f828a9c45bd8fa79721a90c
 
 %{!?scl:%global _non_scl_javadir %{_javadir}}
 %{?scl:%global _non_scl_javadir /usr/share/java}
@@ -11,7 +11,7 @@
 Name:    %{?scl_prefix}eclipse-mylyn
 Summary: Eclipse Mylyn main feature.
 Version: 3.12.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
@@ -86,6 +86,7 @@ Requires: xml-commons-apis
 Requires: httpcomponents-client >= 4.1.3-2
 Requires: httpcomponents-core >= 4.1.4
 Requires: jdom >= 1.1.2-3
+Requires: guava
 Requires: lucene
 %{?scl:Requires: %scl_runtime}
 
@@ -216,13 +217,13 @@ Requires: %{name}-versions = %{version}-%{release}
 Provides CVS integration for Eclipse Mylyn.
 
 %package versions-subclipse
-Summary: Mylyn Versions Connector: CVS
+Summary: Mylyn Versions Connector: SVN
 Requires: %{?scl_prefix}eclipse-platform >= 1:3.8.0
 Requires: %{name}-versions = %{version}-%{release}
 Requires: %{?scl_prefix}eclipse-subclipse
 
 %description versions-subclipse
-Provides CVS integration for Eclipse Mylyn.
+Provides SVN integration for Eclipse Mylyn.
 
 %package builds
 Summary: Eclipse Mylyn Builds
@@ -263,7 +264,6 @@ Requires: %{name}-versions-cvs = %{version}-%{release}
 Requires: %{name}-versions-subclipse = %{version}-%{release}
 Requires: %{name}-builds = %{version}-%{release}
 Requires: %{name}-builds-hudson = %{version}-%{release}
-Requires: guava
 Requires: xalan-j2
 Requires: hamcrest
 Requires: objenesis
@@ -313,7 +313,9 @@ grep -l -r --include="pom.xml" maven-pmd-plugin . | ( while read pom_path; do %p
 
 %pom_disable_module org.eclipse.mylyn.test-feature org.eclipse.mylyn.tasks
 
+#Don't build artifacts that we don't ship
 %pom_disable_module org.eclipse.mylyn.wikitext-standalone org.eclipse.mylyn.docs
+%pom_disable_module org.eclipse.mylyn.wikitext.core.maven org.eclipse.mylyn.docs
 
 #Disable all tests (except one that was easier to build than patch dependent bundles.
 # grep -v org.eclipse.mylyn.doc
@@ -339,7 +341,11 @@ sed -i -e "s/org.apache.xmlrpc;bundle-version=\"3.0.0\"/org.apache.xmlrpc,org.ap
             or child::*[local-name() = 'ws' and not(text() = 'gtk')] 
             or child::*[local-name() = 'arch' and not(text() = '%{_arch}')]) ]" org.eclipse.mylyn/org.eclipse.mylyn-parent/pom.xml
 
-%pom_remove_plugin :tycho-packaging-plugin org.eclipse.mylyn/org.eclipse.mylyn-parent
+#Use default buildtimestamp source
+%pom_remove_dep :tycho-buildtimestamp-jgit org.eclipse.mylyn/org.eclipse.mylyn-parent
+%pom_remove_dep :tycho-sourceref-jgit org.eclipse.mylyn/org.eclipse.mylyn-parent
+sed -i -e "/<sourceReferences>/,+3d" org.eclipse.mylyn/org.eclipse.mylyn-parent/pom.xml
+
 %pom_remove_plugin :jacoco-maven-plugin org.eclipse.mylyn/org.eclipse.mylyn.maven-parent/pom.xml
 %pom_remove_plugin :jacoco-maven-plugin org.eclipse.mylyn/org.eclipse.mylyn-parent/pom.xml
 %pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:%{version}-SNAPSHOT org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki/pom.xml
@@ -359,13 +365,10 @@ sed -i -e "s/JavaSE-1.6/JavaSE-1.8/g" org.eclipse.mylyn.tasks/org.eclipse.mylyn.
 sed -i -e "s/JavaSE-1.6/JavaSE-1.8/g" org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
 
 %build
-%{?scl:%scl_maven_opts}
 export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
-xmvn -o clean install -Dmaven.test.skip=true
+xmvn -o clean verify -Ddist.qualifier="'v'yyyyMMdd-HHmm" -Dmaven.test.skip=true
 
 %install
-install -d %{buildroot}%{install_loc}/mylyn
-install -d %{buildroot}%{install_loc}/mylyn/eclipse
 install -d %{buildroot}%{install_loc}/mylyn/eclipse/plugins
 install -d %{buildroot}%{install_loc}/mylyn/eclipse/features
 
@@ -374,7 +377,7 @@ cp  org.eclipse.mylyn/org.eclipse.mylyn-site/target/site/plugins/*.jar %{buildro
 pushd %{buildroot}%{install_loc}/mylyn/eclipse/plugins/
 
 	rm com.google.gson_*.jar
-	ln -s %{_non_scl_javadir}/google-gson.jar
+	ln -s %{_non_scl_javadir}/google-gson/gson.jar
 
 	rm com.sun.syndication_*.jar
 	ln -s %{_non_scl_javadir}/rome*.jar
@@ -412,7 +415,7 @@ pushd %{buildroot}%{install_loc}/mylyn/eclipse/plugins/
 	ln -s %{_non_scl_javadir}/jdom.jar
 
 	rm org.jsoup_*.jar
-	ln -s %{_non_scl_javadir}/jsoup.jar
+	ln -s %{_non_scl_javadir}/jsoup/jsoup.jar
 
 	rm com.google.guava_*.jar
 	ln -s %{_non_scl_javadir}/guava.jar
@@ -506,7 +509,7 @@ set -e
 %{install_loc}/mylyn/eclipse/plugins/commons-httpclient.jar
 %{install_loc}/mylyn/eclipse/plugins/ws-commons-util.jar
 %{install_loc}/mylyn/eclipse/plugins/jaxp.jar
-%{install_loc}/mylyn/eclipse/plugins/google-gson.jar
+%{install_loc}/mylyn/eclipse/plugins/gson.jar
 %{install_loc}/mylyn/eclipse/plugins/guava.jar
 
 %files context-java
@@ -632,7 +635,6 @@ set -e
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.tests.util_*.jar
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.mylyn.*.source_*.jar
 %{install_loc}/mylyn/eclipse/plugins/org.eclipse.cdt.mylyn.ui.source_*.jar
-%{install_loc}/mylyn/eclipse/plugins/guava.jar
 %{install_loc}/mylyn/eclipse/plugins/xerces-j2.jar
 %{install_loc}/mylyn/eclipse/plugins/xalan-j2-serializer.jar
 %{install_loc}/mylyn/eclipse/plugins/xml-commons-resolver.jar
@@ -641,6 +643,11 @@ set -e
 %{_javadir}/mylyn-tests
 
 %changelog
+* Fri Aug 15 2014 Mat Booth <mat.booth at redhat.com> - 3.12.0-3
+- Ensure the qualifier buildtimestamp is lexigraphically greater than upstream's
+- Fix guava being owned by more than one package
+- Fix broken symlinks for gson and jsoup
+
 * Tue Jul 22 2014 Sami Wagiaalla <swagiaal at redhat.com> - 3.12.0-2
 - Rebuild for new eclipse-pde.
 
