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

[Jan Klepek]

commit acf849c65ba606c611d567cf95395793a2db26d3
Merge: 6d31253 5377826
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Sat Jul 23 21:18:42 2011 +0200

    removed cdiff/decolor due to conflict with colordiff package

 clog                        |    2 +-
 rubygem-term-ansicolor.spec |   15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 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 f8b5b57,194fcb9..f544e84
--- a/rubygem-term-ansicolor.spec
+++ b/rubygem-term-ansicolor.spec
@@@ -43,8 -43,10 +43,15 @@@ d
          touch -r $F chopped
          mv chopped $F
  done
++<<<<<<< HEAD
 +mv -f %{buildroot}%{gemdir}/bin %{buildroot}%{_prefix} 
 +find $RPM_BUILD_ROOT%{geminstdir}/bin -type f |xargs chmod a+x
++=======
+ # 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
+ 
++>>>>>>> master
  
  %clean
  rm -rf $RPM_BUILD_ROOT
@@@ -67,7 -69,6 +74,10 @@@
  %{geminstdir}/*.rb
  %{geminstdir}/lib/
  %{geminstdir}/bin/
++<<<<<<< HEAD
 +%{gemdir}/bin/decolor
++=======
++>>>>>>> master
  %doc %{gemdir}/doc/%{gemname}-%{version}
  %{gemdir}/cache/%{gemname}-%{version}.gem
  %{gemdir}/specifications/%{gemname}-%{version}.gemspec