[rubygem-term-ansicolor/el6: 2/2] removed cdiff/decolor due to conflict with colordiff package

[Jan Klepek]

commit d04f241318a767c4ea94d98f771d418bda106b29
Merge: 834511c 5377826
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Sat Jul 23 21:20:46 2011 +0200

    removed cdiff/decolor due to conflict with colordiff package

 clog                        |    2 +-
 rubygem-term-ansicolor.spec |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc clog
index 0e5929b,0000000..e4ed362
mode 100644,000000..100644
--- a/clog
+++ b/clog
@@@ -1,1 -1,0 +1,1 @@@
- New version
++removed cdiff/decolor due to conflict with colordiff package
diff --cc rubygem-term-ansicolor.spec
index 3bf0692,194fcb9..16c54f2
--- a/rubygem-term-ansicolor.spec
+++ b/rubygem-term-ansicolor.spec
@@@ -43,9 -43,11 +43,10 @@@ d
          touch -r $F chopped
          mv chopped $F
  done
- mv -f %{buildroot}%{gemdir}/bin %{buildroot}%{_prefix} 
+ # removing cdiff and decolor due to file conflict with colordiff package
+ rm -rf %{buildroot}%{gemdir}/bin
  find $RPM_BUILD_ROOT%{geminstdir}/bin -type f |xargs chmod a+x
  
 -
  %clean
  rm -rf $RPM_BUILD_ROOT