rpms/colordiff/devel colordiff-colors.patch, NONE, 1.1 colordiff.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	.cvsignore sources 
Added Files:
	colordiff-colors.patch colordiff.spec 
Log Message:
auto-import colordiff-1.0.5-1 on branch devel from colordiff-1.0.5-1.src.rpm

colordiff-colors.patch:

--- NEW FILE colordiff-colors.patch ---
diff -Naru colordiff-1.0.5.orig/colordiff.pl colordiff-1.0.5/colordiff.pl
--- colordiff-1.0.5.orig/colordiff.pl	2005-03-28 23:11:34.000000000 +0300
+++ colordiff-1.0.5/colordiff.pl	2005-03-28 23:51:07.417088569 +0300
@@ -60,11 +60,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};
diff -Naru colordiff-1.0.5.orig/colordiffrc colordiff-1.0.5/colordiffrc
--- colordiff-1.0.5.orig/colordiffrc	2004-06-06 13:29:17.000000000 +0300
+++ colordiff-1.0.5/colordiffrc	2005-03-28 23:51:03.681235652 +0300
@@ -10,8 +10,8 @@
 #                        darkblue, darkcyan, darkred,
 #                        darkmagenta, darkblack
 #
-plain=white
+plain=darkwhite
 newtext=blue
 oldtext=red
 diffstuff=magenta
-cvsstuff=yellow
+cvsstuff=darkyellow
diff -Naru colordiff-1.0.5.orig/colordiffrc-lightbg colordiff-1.0.5/colordiffrc-lightbg
--- colordiff-1.0.5.orig/colordiffrc-lightbg	2004-06-06 13:29:17.000000000 +0300
+++ colordiff-1.0.5/colordiffrc-lightbg	2005-03-28 23:50:58.836723125 +0300
@@ -11,7 +11,7 @@
 #                        darkmagenta, darkblack
 #
 plain=black
-newtext=blue
-oldtext=red
-diffstuff=green
-cvsstuff=yellow
+newtext=darkblue
+oldtext=darkred
+diffstuff=darkgreen
+cvsstuff=darkwhite


--- NEW FILE colordiff.spec ---
Name:           colordiff
Version:        1.0.5
Release:        1
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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  sed
Requires:       bzip2, gzip, less, diffutils
Provides:       cdiff
Obsoletes:      cdiff <= 1.4

%description
Colordiff is a wrapper for diff and produces the same output but with
pretty syntax highlighting.  Color schemes can be customized.


%prep
%setup -q
%patch0 -p1
mv colordiffrc colordiffrc-darkbg
sed -i -e 's/banner=yes/banner=no/' colordiffrc-*


%build


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 colordiff.pl $RPM_BUILD_ROOT%{_bindir}/colordiff
install -pm 755 cdiff.sh $RPM_BUILD_ROOT%{_bindir}/cdiff
install -Dpm 644 colordiff.1 $RPM_BUILD_ROOT%{_mandir}/man1/colordiff.1
install -Dpm 644 colordiffrc-lightbg $RPM_BUILD_ROOT%{_sysconfdir}/colordiffrc


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc BUGS CHANGES colordiffrc-darkbg colordiffrc-lightbg COPYING README
%config(noreplace) %{_sysconfdir}/colordiffrc
%{_bindir}/cdiff
%{_bindir}/colordiff
%{_mandir}/man1/colordiff.1*


%changelog
* Sat May 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0.5-1
- Add version to cdiff Obsoletes (Matthias Saou).
- Require diffutils (Matthias Saou, Matthew Miller).

* Mon Mar 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0.5-0.1
- 1.0.5.

* Thu Mar 17 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0.4-0.1
- Disable banner display in default configs.
- Drop unnecessary Epochs.

* Fri Aug 13 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.4-0.fdr.3
- Apply upstream fix for context diff detection.

* Thu Aug 12 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.4-0.fdr.2
- Use lightbg as the default scheme and make it work better with dark
  backgrounds too.

* Sat Jul 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.4-0.fdr.1
- First build.
- Include cdiff wrapper.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/colordiff/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 May 2005 08:42:17 -0000	1.1
+++ .cvsignore	21 May 2005 08:42:50 -0000	1.2
@@ -0,0 +1 @@
+colordiff-1.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/colordiff/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 May 2005 08:42:17 -0000	1.1
+++ sources	21 May 2005 08:42:50 -0000	1.2
@@ -0,0 +1 @@
+b8ef81a80dfa8a4c001915d03a73f7d1  colordiff-1.0.5.tar.gz