[tycho] Add BR/R on explicit dependency objectweb-asm4.
Roland Grunberg
rgrunber at fedoraproject.org
Mon Aug 27 17:18:17 UTC 2012
commit 9ab446899e04422a78c24b1a594c8ed45b9d47df
Author: Roland Grunberg <rgrunber at redhat.com>
Date: Mon Aug 27 11:41:26 2012 -0400
Add BR/R on explicit dependency objectweb-asm4.
tycho.spec | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index b5a5905..4137470 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,4 +1,4 @@
-%global bootstrap 0
+%global bootstrap 1
%global sha df2c3591ae0e641a8d12c13ca9c1058eaf8439b2
%if %{bootstrap}
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.16.0
-Release: 6.df2c35%{?dist}
+Release: 6.1.df2c35%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -26,15 +26,15 @@ Source1: EmptyMojo.java
Source2: depmap.xml
Source3: copy-platform-all
-Patch0: %{name}-fix-build.patch
-Patch1: %{name}-fix-surefire.patch
+Patch0: %{name}-fix-build.patch
+Patch1: %{name}-fix-surefire.patch
# Upstream builds against maven-surefire 2.10 but in rawhide we have 2.12
-Patch2: %{name}-maven-surefire.patch
-Patch3: %{name}-use-custom-resolver.patch
+Patch2: %{name}-maven-surefire.patch
+Patch3: %{name}-use-custom-resolver.patch
# Set some temporary build version so that the bootstrapped build has
# a different version from the nonbootstrapped. Otherwise there will
# be cyclic dependencies.
-Patch4: %{name}-bootstrap.patch
+Patch4: %{name}-bootstrap.patch
BuildArch: noarch
@@ -55,10 +55,11 @@ BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-surefire-provider-junit4
BuildRequires: maven-verifier-plugin
+BuildRequires: objectweb-asm4
BuildRequires: plexus-containers-component-metadata
BuildRequires: eclipse-jdt
BuildRequires: decentxml
-BuildRequires: %{name}
+BuildRequires: %{name}
Requires: jpackage-utils
Requires: decentxml
@@ -67,6 +68,7 @@ Requires: maven-clean-plugin
Requires: maven-dependency-plugin
Requires: maven-shared-verifier
Requires: maven-surefire-provider-junit4
+Requires: objectweb-asm4
Requires: eclipse-jdt
@@ -191,6 +193,10 @@ install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all
%{_javadocdir}/%{name}
%changelog
+* Mon Aug 27 2012 Roland Grunberg <rgrunber at redhat.com> 0.16.0-6.1.df2c35
+- Add BR/R on explicit dependency objectweb-asm4.
+- Use consistent whitespace in specfile.
+
* Fri Aug 24 2012 Roland Grunberg <rgrunber at redhat.com> 0.16.0-6.df2c35
- Non-bootstrap build.
More information about the scm-commits
mailing list