From bcbe729d44b88387b517812f8931d577e8dd2af6ec401819a68d2c20b80107b8 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 11 Sep 2017 08:28:44 +0000 Subject: [PATCH 1/2] Accepting request 522897 from home:avindra - Update to 1.0.18 * see attached CHANGES for details - Cleanup with spec-cleaner OBS-URL: https://build.opensuse.org/request/show/522897 OBS-URL: https://build.opensuse.org/package/show/devel:tools/colordiff?expand=0&rev=15 --- colordiff-1.0.16.tar.gz | 3 --- colordiff-1.0.16.tar.gz.sig | Bin 1055 -> 0 bytes colordiff-1.0.18.tar.gz | 3 +++ colordiff-1.0.18.tar.gz.sig | Bin 0 -> 1055 bytes colordiff.changes | 7 +++++++ colordiff.spec | 6 ++---- 6 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 colordiff-1.0.16.tar.gz delete mode 100644 colordiff-1.0.16.tar.gz.sig create mode 100644 colordiff-1.0.18.tar.gz create mode 100644 colordiff-1.0.18.tar.gz.sig diff --git a/colordiff-1.0.16.tar.gz b/colordiff-1.0.16.tar.gz deleted file mode 100644 index 9984a3d..0000000 --- a/colordiff-1.0.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eaf1cfe17dd0e820d38a0b24b0a402eba68b32e9bf9e7791ca2d1831029f138b -size 21542 diff --git a/colordiff-1.0.16.tar.gz.sig b/colordiff-1.0.16.tar.gz.sig deleted file mode 100644 index 8cdc0fe3b659694d0419ee402ef2e3bcfd3e77f37078a47b018da5d40931b118..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1055 zcmV+)1mOFL1RMka0SW*H1p-zq@Am)-2@pl$&PKt-i5LOOX@!LtlCFqUe{*!s#_21&&%RH z?#{xVZWiV(q386s`8rPcB$E~SEQgy>R)tHVQvKxjqxrBcIi%q)1_p37XnyR!a<|A& z-Q5P3r)!mLNKM#cTS#yPl!m^?E8PeZpDdtGUkpCOlG*4%>{Ey!DgK5hcP=jhY~+sgQ*(tuORD5&o5!7#XU;LO`2&N#o* z8pTwK*4Gc563NlJs~U!BDel2DGoT9`d(fP*H;UEwvNH$~V!QV6fjN$oTlUN41n$P1 zso!{T&s;|a5;JZt^5g5yUPY{I2k1SiFn28&5{|JB`lOow1~Nntlu3WPv}Wt-POi}y zzfFM^h>#Q`*UM(QNVHc(E7VQ1s*XDe-hW?Zf&gVLez4ic?hx>%r>F=odKK~YCeGvZ z{hCBHnv9iihf_x9+ME&$NH-Wt_SG-e4l>V%ikbF(Nkv4C|akWdWhX=drhUL}Zi zgyitk8Z)Q~PipQ{u&t79Out>=Sb+Hm3RPG1H9~ZB#BXf> z18nXOjYo<`v6y{2r^M6P*_rBPUQw2ZpK)uR4nyOAXfE1qT7?FT8EjzLoYg zq5j}!f)1G8UQj_b+z|8}V`f!mvWuF99wb4+)O16GiC`U(CvT^96pkXCEyiT_WEmzg zW42Qn@UU>ToV99+7=C%pNVYGo;uOE2Me67yB3Xtg1f6N#)S#)>#-fG@R3o7Vt8h8MU5}TFz&+2A`IWf+EH8dwcsBI z>HQQe&(vN$Hi_`Ly!4#glTC}HZ?!s5-K9G{tIi7d@gI>%E~@$Rho*}>W|~LUy3NVD zg_HZwQ&iVJ_3J#{w`aFFCIqp^r?{%Fcs6Ozjg8q183&$=mO}Cj+zr=}P`zpIqwee!`=YdD$Q2ZggyH4D zh4hX^Bs-K6N{i+z_o5!twN|A+FfB0#{}hGcxw)=LPV-^y@2?TEqDd!dhRcq)TG4WY z@W!%lz;m>Ac4%>D8@78JYfo!qgnu!Y0HXOvn;JQj8D zXQcZD)Y1d}@Z5TkB)tVx7B)C93A`8;2LECZjeVk+2{gLxks_MiP432v)K<3D?B16A;L^lNps3a{p@&AHm*&Sxoy4to%q+dzR~vxuw_=@Ev*1%0nQmP?(PftiG!=tb zln0Dj3qTqsE*;8SHH57AES#2RJ1w|^lSjKIsl0^BPf4W(FqkSlkR#fKQFV3My9mLn zq_?NTEpv3Xyl`k#_3oT#1#x4f{-eZbQU`3+>HU#KRQ6^YG{J*gP(x#&3mXrudeqtS zPLJ17SFPN04tXWHhw{*jJId5;v`@fLGgkA@`Es}DYe<}O+x~SXosW)5_z=;V<4f3q zkDn+m_Qpf2$ruNR1zEM}?~k^K)>(@5PjM8<>s}2^`l=IlBnYo?31vS)6<$#$Errr1 zhvCSXPAji>{NCZVk*OcY7USrErpDn*JxHs zqkgxj{lcq=;-LF{mcDXjgY5&!jHzzo z->&j+s7(QAINRr!`7!j*&L@CZm@+CBX(*IvcAA}jV3G!5<}*Sh?hlUDVmHpnBu|3g z4BF_DO)PJYHjX-5XD#4-vxuw=?;2~R!IsgpBGDl3JxmXqVHcVKB_0NpoL40#1g{ce z0%wwZ{ngpPB>GuS0NQ_3p`C$cuN)#d>)m-p;8zbnms_Yvfb6Uujb5Y-z{ti;YHtMe z$&OJ^E-@D>xm7aeTQHNMkf05xTD^FYMeWUb&)|}`nqAx2mm!QoMK$%>llw&(Y=cgA ZzaOx#uRJXIzLv7RfXb@|GgGY^FXFC%14#e? literal 0 HcmV?d00001 diff --git a/colordiff.changes b/colordiff.changes index a6783c6..14eebc0 100644 --- a/colordiff.changes +++ b/colordiff.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Sep 10 15:41:24 UTC 2017 - aavindraa@gmail.com + +- Update to 1.0.18 + * see attached CHANGES for details +- Cleanup with spec-cleaner + ------------------------------------------------------------------- Fri Dec 25 14:03:43 UTC 2015 - mpluskal@suse.com diff --git a/colordiff.spec b/colordiff.spec index 426d531..33bee3b 100644 --- a/colordiff.spec +++ b/colordiff.spec @@ -1,7 +1,7 @@ # # spec file for package colordiff # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: colordiff -Version: 1.0.16 +Version: 1.0.18 Release: 0 Summary: Colour-highlighted 'diff' output License: GPL-2.0+ @@ -27,7 +27,6 @@ Source0: http://www.colordiff.org/%{name}-%{version}.tar.gz Source1: http://www.colordiff.org/%{name}-%{version}.tar.gz.sig Source2: %{name}.keyring Patch0: colordiff-fix-permission.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -52,7 +51,6 @@ sed -i -e "s@%{buildroot}@@" %{buildroot}/%{_bindir}/colordiff chmod a-x %{buildroot}/%{_mandir}/man1/colordiff.* %files -%defattr(-,root,root) %doc README COPYING CHANGES BUGS colordiffrc colordiffrc-lightbg %config %{_sysconfdir}/colordiffrc %{_bindir}/cdiff From 802f4dc5036565fcf267c3449e7b2d1d41ec0aa65c56e1e8edc9c5f8be55e769 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 11 Sep 2017 08:30:10 +0000 Subject: [PATCH 2/2] - Update to 1.0.18: * Ensure --color=no is honoured where appropriate, add --color-term-output-only plus minor fixes. * Fix regression which broke piping to less. OBS-URL: https://build.opensuse.org/package/show/devel:tools/colordiff?expand=0&rev=16 --- colordiff.changes | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/colordiff.changes b/colordiff.changes index 14eebc0..e1b2936 100644 --- a/colordiff.changes +++ b/colordiff.changes @@ -1,8 +1,10 @@ ------------------------------------------------------------------- Sun Sep 10 15:41:24 UTC 2017 - aavindraa@gmail.com -- Update to 1.0.18 - * see attached CHANGES for details +- Update to 1.0.18: + * Ensure --color=no is honoured where appropriate, add + --color-term-output-only plus minor fixes. + * Fix regression which broke piping to less. - Cleanup with spec-cleaner -------------------------------------------------------------------