[eclipse-mylyn/f17] Add proper BR for jpackage-utils and maven.

Krzysztof Daniel kdaniel at fedoraproject.org
Wed Jul 11 09:11:01 UTC 2012


commit 41eec1537d41390a31b18dc0604bb16573147510
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Wed Jul 11 10:51:47 2012 +0200

    Add proper BR for jpackage-utils and maven.

 eclipse-mylyn.spec |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index 783855a..555de30 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -5,7 +5,7 @@
 Name: eclipse-mylyn
 Summary: Eclipse Mylyn main feature.
 Version: 3.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
@@ -44,7 +44,7 @@ BuildArch: noarch
 %endif
 
 BuildRequires: java-devel >= 1.7.0
-BuildRequires: javapackages-tools >= 0.4.0
+BuildRequires: jpackage-utils >= 1.7.5-18.1
 BuildRequires: eclipse-platform >= 1:4.2.0
 BuildRequires: eclipse-pde >= 1:4.2.0-0.6
 BuildRequires: eclipse-rcp >= 1:4.2.0-0.6
@@ -56,6 +56,7 @@ BuildRequires: tycho >= 0.14.1-5
 BuildRequires: eclipse-egit
 BuildRequires: jacoco
 BuildRequires: lucene
+BuildRequires: maven >= 3.0.4-7
 
 BuildRequires: axis >= 1.4
 BuildRequires: apache-commons-lang >= 2.6-6
@@ -359,6 +360,8 @@ grep -l -r --include="pom.xml" maven-pmd-plugin . | ( while read pom_path; do %p
 #Disable modules we can't build yet
 %pom_disable_module org.eclipse.mylyn.reviews .
 
+#%pom_disable_module stubs org.eclipse.mylyn.commons . 
+
 %pom_disable_module org.eclipse.mylyn.tests org.eclipse.mylyn .
 
 %pom_disable_module org.eclipse.mylyn.test-feature org.eclipse.mylyn.tasks .
@@ -405,7 +408,8 @@ eclipse -debug -consolelog -nosplash -verbose \
 -compress -append -publishArtifacts
 
 %build
-mvn-rpmbuild clean install -Dmaven.test.skip=true -DforceContextQualifier=v20120612-0600
+mvn-rpmbuild clean install -Dmaven.test.skip=true 
+#-DforceContextQualifier=v20120612-0600
 
 %install
 install -d %{buildroot}%{install_loc}/mylyn
@@ -691,6 +695,9 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/redhat-bugzilla-custom-trans
 %doc org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.sdk-feature/license.html
 
 %changelog
+* Tue Jul 10 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.8.0-2
+- Add proper BR for jpackage-utils and maven.
+
 * Wed Jul 10 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.8.0-1
 - Completely repackaged mylyn.
 - Added epub feature.


More information about the scm-commits mailing list