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

Jan Klepek hpejakle at fedoraproject.org
Sat Jul 23 19:10:30 UTC 2011


commit 53778260d478f472d2b5798073ba03cd3959b0ee
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Sat Jul 23 21:10:15 2011 +0200

    removed cdiff/decolor due to conflict with colordiff package

 rubygem-term-ansicolor.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/rubygem-term-ansicolor.spec b/rubygem-term-ansicolor.spec
index 3e9e32e..194fcb9 100644
--- a/rubygem-term-ansicolor.spec
+++ b/rubygem-term-ansicolor.spec
@@ -6,7 +6,7 @@
 Summary:        Ruby library that colors strings using ANSI escape sequences
 Name:           rubygem-%{gemname}
 Version:        1.0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          Development/Languages
 License:        GPLv2
 URL:            http://term-ansicolor.rubyforge.org
@@ -43,6 +43,9 @@ do
         touch -r $F chopped
         mv chopped $F
 done
+# 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
@@ -66,14 +69,15 @@ rm -rf $RPM_BUILD_ROOT
 %{geminstdir}/*.rb
 %{geminstdir}/lib/
 %{geminstdir}/bin/
-%{gemdir}/bin/cdiff
-%{gemdir}/bin/decolor
 %doc %{gemdir}/doc/%{gemname}-%{version}
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 
 %changelog
+* Sat Jul 23 2011 Jan Klepek <jan.klepek at, gmail.com> - 1.0.6-2
+- removed cdiff/decolor due to conflict with colordiff package
+
 * Sat Jul 23 2011 Jan Klepek <jan.klepek at, gmail.com> - 1.0.6-1
 - New version
 


More information about the scm-commits mailing list