rpms/colordiff/EL-5 .cvsignore, 1.3, 1.4 colordiff.spec, 1.4, 1.5 sources, 1.3, 1.4 colordiff-1.0.6-color_patches.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/colordiff/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3072

Modified Files:
	.cvsignore colordiff.spec sources 
Removed Files:
	colordiff-1.0.6-color_patches.patch 
Log Message:
Sync with Fedora devel for first EL build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	4 Apr 2007 17:04:31 -0000	1.3
+++ .cvsignore	8 Jul 2007 08:33:03 -0000	1.4
@@ -1 +1 @@
-colordiff-1.0.6.tar.gz
+colordiff-1.0.6a.tar.gz


Index: colordiff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/EL-5/colordiff.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- colordiff.spec	4 Apr 2007 17:07:18 -0000	1.4
+++ colordiff.spec	8 Jul 2007 08:33:03 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           colordiff
-Version:        1.0.6
+Version:        1.0.6a
 Release:        2%{?dist}
 Summary:        Color terminal highlighter for diff files
 
@@ -8,7 +8,6 @@
 URL:            http://colordiff.sourceforge.net/
 Source0:        http://colordiff.sourceforge.net/%{name}-%{version}.tar.gz
 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
@@ -26,8 +25,8 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 mv colordiffrc colordiffrc-darkbg
+f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
 %build
@@ -55,6 +54,12 @@
 
 
 %changelog
+* Sat Jul  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-2
+- Convert docs to UTF-8.
+
+* Sat May 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-1
+- 1.0.6a.
+
 * Wed Apr  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6-2
 - 1.0.6.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/colordiff/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	4 Apr 2007 17:04:31 -0000	1.3
+++ sources	8 Jul 2007 08:33:03 -0000	1.4
@@ -1 +1 @@
-a27bfccc24cd9874eb1d1abe40dc2457  colordiff-1.0.6.tar.gz
+db49d0779a453c96f0859cd20b7b1aa9  colordiff-1.0.6a.tar.gz


--- colordiff-1.0.6-color_patches.patch DELETED ---