Updated Branches: refs/heads/4.0 0f4cf2eea -> 599048c9b
CLOUDSTACK-1629 - adding a conflict with antlr package Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/599048c9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/599048c9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/599048c9 Branch: refs/heads/4.0 Commit: 599048c9b22905d714e87921f4b02aa56192ba91 Parents: 0f4cf2e Author: David Nalley <[email protected]> Authored: Sun Apr 14 22:22:10 2013 -0400 Committer: David Nalley <[email protected]> Committed: Sun Apr 14 22:23:54 2013 -0400 ---------------------------------------------------------------------- cloud.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/599048c9/cloud.spec ---------------------------------------------------------------------- diff --git a/cloud.spec b/cloud.spec index debe3ae..79eb581 100644 --- a/cloud.spec +++ b/cloud.spec @@ -119,6 +119,7 @@ Summary: CloudStack library dependencies Requires: java >= 1.6.0 Requires: mysql-connector-java Obsoletes: vmops-deps < %{version}-%{release} +Conflicts: antlr Group: System Environment/Libraries %description deps This package contains a number of third-party dependencies
