From 8c61ff650ed783ad700614ca70903cd5f5eed86d Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Wed, 2 Jan 2013 23:36:18 -0600
Subject: moreutils and task-spooler conflict

Fixes #16850.
---
 Library/Formula/moreutils.rb    | 3 +++
 Library/Formula/task-spooler.rb | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'Library/Formula')

diff --git a/Library/Formula/moreutils.rb b/Library/Formula/moreutils.rb
index d530319f2..9b77e186f 100644
--- a/Library/Formula/moreutils.rb
+++ b/Library/Formula/moreutils.rb
@@ -9,6 +9,9 @@ class Moreutils < Formula
   conflicts_with 'parallel',
     :because => "both install a 'parallel' executable."
 
+  conflicts_with 'task-spooler',
+    :because => "both install a 'ts' executable."
+
   def install
     # Building the man pages requires DocBook, so we skip them.
     scripts = %w[chronic combine ts vidir vipe zrun]
diff --git a/Library/Formula/task-spooler.rb b/Library/Formula/task-spooler.rb
index 3313c40f7..6bea30810 100644
--- a/Library/Formula/task-spooler.rb
+++ b/Library/Formula/task-spooler.rb
@@ -5,6 +5,9 @@ class TaskSpooler < Formula
   url 'http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.3.tar.gz'
   sha1 '33b9321d4f48a2c2685a8240db4e00c0e69ef9bc'
 
+  conflicts_with 'moreutils',
+    :because => "both install a 'ts' executable."
+
   def install
     system "make", "install", "PREFIX=#{prefix}"
   end
-- 
cgit v1.2.3