From a88fc188c7979e348cfca4f1ac11da1f9e6ab912e3f1b4212bfec9a6370f11e6 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 26 Aug 2009 14:57:19 +0000 Subject: [PATCH] Accepting request 18759 from devel:tools Copy from devel:tools/colordiff based on submit request 18759 from user mlschroe OBS-URL: https://build.opensuse.org/request/show/18759 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/colordiff?expand=0&rev=5 --- colordiff.changes | 5 +++++ colordiff.spec | 24 ++---------------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/colordiff.changes b/colordiff.changes index 59dc389..35fb4db 100644 --- a/colordiff.changes +++ b/colordiff.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de + +- make patch0 usage consistent + ------------------------------------------------------------------- Mon Jun 8 13:29:56 CEST 2009 - mseben@suse.cz diff --git a/colordiff.spec b/colordiff.spec index 3cf37a1..dd962fb 100644 --- a/colordiff.spec +++ b/colordiff.spec @@ -20,7 +20,7 @@ Name: colordiff Url: http://colordiff.sourceforge.net/ Version: 1.0.9 -Release: 1 +Release: 2 License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Productivity/Text/Utilities @@ -42,7 +42,7 @@ Authors: %prep %setup -q -%patch +%patch0 %build @@ -67,23 +67,3 @@ rm -rf "$RPM_BUILD_ROOT" %config /etc/colordiffrc %changelog -* Mon Jun 08 2009 mseben@suse.cz -- updated to 1.0.9 version - - Fix for Debian bug 513313 incorporated. -- set /etc/colordiffrc as config file in spec -* Wed Mar 18 2009 mseben@suse.cz -- updated to 1.0.8a version -- Changes between version 1.0.6a and 1.0.7a - - Support introduced for 'wdiff' colourising (thanks to Tom Regner) - - Correctly handles undefined HOME (patches from various people). - - Support for p4 diffs added by Alexis Layton, plus bug fix for - blank first lines -- Changes between version 1.0.7a and 1.0.8a - - Support for numeric colours added, for 256-colour terminals - (thanks to GautamIyer). - - Diff-types can now be specified explicitly, for use when - diff-type detection doesn't work or isn't possible. - - Return diff's exit code, patch from Tim Connors. Allow - extraneous diff text to be coloured separately. -* Sun Jun 24 2007 bwalle@suse.de -- initial SUSE package