rpms/colordiff/devel branch, NONE, 1.1 colordiff-1.0.6-color_patches.patch, NONE, 1.1 colordiff-1.0.6-colors.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 colordiff.spec, 1.2, 1.3 sources, 1.2, 1.3 colordiff-colors.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/colordiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12114/FC-6

Modified Files:
	.cvsignore colordiff.spec sources 
Added Files:
	branch colordiff-1.0.6-color_patches.patch 
	colordiff-1.0.6-colors.patch 
Removed Files:
	colordiff-colors.patch 
Log Message:
* Wed Apr  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6-1
- 1.0.6.



--- NEW FILE branch ---
FC-6

colordiff-1.0.6-color_patches.patch:

--- NEW FILE colordiff-1.0.6-color_patches.patch ---
--- colordiff-1.0.6/colordiff.pl~	2006-09-13 22:37:24.000000000 +0300
+++ colordiff-1.0.6/colordiff.pl	2007-04-04 18:45:36.000000000 +0300
@@ -86,7 +86,7 @@
                 }
                 next;
             }
-            if ($setting eq 'color_patch') {
+            if ($setting eq 'color_patches') {
                 if ($value eq 'yes') {
                     $color_patch = 1;
                 }

colordiff-1.0.6-colors.patch:

--- NEW FILE colordiff-1.0.6-colors.patch ---
--- colordiff-1.0.6/colordiff.pl~	2006-09-13 22:37:24.000000000 +0300
+++ colordiff-1.0.6/colordiff.pl	2007-04-04 19:09:01.000000000 +0300
@@ -55,11 +55,11 @@
 $colour{off}         = "\033[0;0m";
 
 # Default colours if /etc/colordiffrc or ~/.colordiffrc do not exist
-my $plain_text = $colour{white};
+my $plain_text = $colour{darkwhite};
 my $file_old   = $colour{red};
 my $file_new   = $colour{blue};
 my $diff_stuff = $colour{magenta};
-my $cvs_stuff  = $colour{green};
+my $cvs_stuff  = $colour{darkyellow};
 
 # Locations for personal and system-wide colour configurations
 my $HOME   = $ENV{HOME};
--- colordiff-1.0.6/colordiffrc~	2006-07-31 21:36:22.000000000 +0300
+++ colordiff-1.0.6/colordiffrc	2007-04-04 19:09:30.000000000 +0300
@@ -19,8 +19,8 @@
 # aliases for the same thing, namely "don't colour highlight
 # this, use the default output colour"
 #
-plain=off
+plain=darkwhite
 newtext=blue
 oldtext=red
 diffstuff=magenta
-cvsstuff=green
+cvsstuff=darkyellow
--- colordiff-1.0.6/colordiffrc-lightbg~	2006-07-31 21:37:11.000000000 +0300
+++ colordiff-1.0.6/colordiffrc-lightbg	2007-04-04 19:08:08.000000000 +0300
@@ -19,8 +19,8 @@
 # aliases for the same thing, namely "don't colour highlight
 # this, use the default output colour"
 #
-plain=off
-newtext=blue
-oldtext=red
+plain=black
+newtext=darkblue
+oldtext=darkred
 diffstuff=darkgreen
-cvsstuff=darkmagenta
+cvsstuff=darkwhite


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/colordiff/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 May 2005 08:42:50 -0000	1.2
+++ .cvsignore	4 Apr 2007 16:41:53 -0000	1.3
@@ -1 +1 @@
-colordiff-1.0.5.tar.gz
+colordiff-1.0.6.tar.gz


Index: colordiff.spec
===================================================================
RCS file: /cvs/extras/rpms/colordiff/devel/colordiff.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- colordiff.spec	30 Aug 2006 06:37:59 -0000	1.2
+++ colordiff.spec	4 Apr 2007 16:41:53 -0000	1.3
@@ -1,18 +1,21 @@
 Name:           colordiff
-Version:        1.0.5
-Release:        2
+Version:        1.0.6
+Release:        1%{?dist}
 Summary:        Color terminal highlighter for diff files
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://colordiff.sourceforge.net/
 Source0:        http://colordiff.sourceforge.net/%{name}-%{version}.tar.gz
-Patch0:         %{name}-colors.patch
+Patch0:         %{name}-1.0.6-colors.patch
+Patch1:         %{name}-1.0.6-color_patches.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  sed
-Requires:       bzip2, gzip, less, diffutils
+Requires:       bzip2
+Requires:       gzip
+Requires:       less
+Requires:       diffutils
 Provides:       cdiff
 
 %description
@@ -23,8 +26,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 mv colordiffrc colordiffrc-darkbg
-sed -i -e 's/banner=yes/banner=no/' colordiffrc-*
 
 
 %build
@@ -52,6 +55,9 @@
 
 
 %changelog
+* Wed Apr  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6-1
+- 1.0.6.
+
 * Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.5-2
 - Drop no longer needed Obsoletes.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/colordiff/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 May 2005 08:42:50 -0000	1.2
+++ sources	4 Apr 2007 16:41:53 -0000	1.3
@@ -1 +1 @@
-b8ef81a80dfa8a4c001915d03a73f7d1  colordiff-1.0.5.tar.gz
+a27bfccc24cd9874eb1d1abe40dc2457  colordiff-1.0.6.tar.gz


--- colordiff-colors.patch DELETED ---