From c19105fce5820e1856cabbd0afa603995e1275387cf5ae10ca68b4b3c1b02f77 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 14 Jul 2020 05:24:17 +0000 Subject: [PATCH] Accepting request 820639 from home:elimat:branches:devel:tools - Update to 1.0.19 * Add 'difffile' color option, allowing more git-like coloring (separate color for header of each changed file). Thanks Geraint Edwards. * Improved portability of Makefile, thanks Michael Osipov. * Provide support for 24-bit colour strings, thanks Stephen Wall. - Run spec-cleaner * Drop package groups - Drop patch colordiff-fix-permission.diff not needed anymore OBS-URL: https://build.opensuse.org/request/show/820639 OBS-URL: https://build.opensuse.org/package/show/devel:tools/colordiff?expand=0&rev=18 --- colordiff-1.0.18.tar.gz | 3 --- colordiff-1.0.18.tar.gz.sig | Bin 1055 -> 0 bytes colordiff-1.0.19.tar.gz | 3 +++ colordiff-1.0.19.tar.gz.sig | Bin 0 -> 1078 bytes colordiff-fix-permission.diff | 15 --------------- colordiff.changes | 12 ++++++++++++ colordiff.spec | 31 ++++++++++++------------------- 7 files changed, 27 insertions(+), 37 deletions(-) delete mode 100644 colordiff-1.0.18.tar.gz delete mode 100644 colordiff-1.0.18.tar.gz.sig create mode 100644 colordiff-1.0.19.tar.gz create mode 100644 colordiff-1.0.19.tar.gz.sig delete mode 100644 colordiff-fix-permission.diff diff --git a/colordiff-1.0.18.tar.gz b/colordiff-1.0.18.tar.gz deleted file mode 100644 index 41ca1eb..0000000 --- a/colordiff-1.0.18.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29cfecd8854d6e19c96182ee13706b84622d7b256077df19fbd6a5452c30d6e0 -size 21695 diff --git a/colordiff-1.0.18.tar.gz.sig b/colordiff-1.0.18.tar.gz.sig deleted file mode 100644 index cb1ebde9806cba9a1f4c3dd8db90004943fc6c950507a5269da316f1c0aa062b..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1055 zcmV+)1mOFL1RMka0SW*H1p-+yzz+Zl2@pl$`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? diff --git a/colordiff-1.0.19.tar.gz b/colordiff-1.0.19.tar.gz new file mode 100644 index 0000000..4c63bd7 --- /dev/null +++ b/colordiff-1.0.19.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46e8c14d87f6c4b77a273cdd97020fda88d5b2be42cf015d5d84aca3dfff3b19 +size 21329 diff --git a/colordiff-1.0.19.tar.gz.sig b/colordiff-1.0.19.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..f02fa7cc4e4aa5a013b58fc3b45547090a9329422b2f09d3b98bf20c92270a0e GIT binary patch literal 1078 zcmV-61j+k}1TzEx0SW*e79j-BI+O1K<`%`SdL1W4;pB5Si?Npl0$!Tm000UJ5JlnS zb2p2zm)lhz`v>t!_Vz>pUYJjJD*ofQR7PGhA>gu?Cq9y3)?b4{Q+HHj>+n#~v#v@- za)3=um!q@EacZJrI!T;~S0!T5z*O?CFkCW&5ZYBwixb_EY`CV|9#i7e)I1?Rb@AW9 zm}!B(?GqbL3cL*Nu(6QALvrYH4C5U4urZjA7RDXAp#26lP$et7)F0Cs+~Q%?2%gjH z!-TZk5B9)j(C26E*958k%M@@3Ls+%N(VsPlo2p#4C2BIfMke|Q83{D>_(HZgKBqsL z=irheYhhzViymlvNUmmHTl9d$2k6xECVFsl6x{6~zzzqtg}wh@M4{+Pzo~ zGv!Wc%SI1ifyHinIvcQFHj|7U4{~{Cgjz7$s=nzX>2Mg#oeHiUAsl;nTf6)+H9xpdI-kqNAuEL^&PkJN_>e z!Ph>hv{YIIMbWqmA(B1;Q7FwV(iEty=5rBS&|<0hFmm}p>@WFcy-0Kwl_V&Q;Dm1Q zAee|-u1wI~()d)LGRJ5UXq(0HUpp4t`{$49`0zH^$4idb4(r*xT4~RGaM!95A;_DD z_OsqfWUSs$#039)hD#Vsm!ExZ*e70ArBUDnMr?vX9pir*Iw; zeEy0S>Xu>@3=w`wy$r?^0$Zi>`HrOtxSG0EN1Y{`e8*u>gT;!7&~#FVAuKwc@Hpd? zmAsVeo7Nxn_KBd{qg~#?F|uM>%-nig;o{GHW9LKwcuqwwh_CB778?WnBqI*C{DVN8 z_D~sjJU+4_FjKG3<_<}`CFL|SNJERM + +- Update to 1.0.19 + * Add 'difffile' color option, allowing more git-like coloring (separate + color for header of each changed file). Thanks Geraint Edwards. + * Improved portability of Makefile, thanks Michael Osipov. + * Provide support for 24-bit colour strings, thanks Stephen Wall. +- Run spec-cleaner + * Drop package groups +- Drop patch colordiff-fix-permission.diff not needed anymore + ------------------------------------------------------------------- Sun Sep 10 15:41:24 UTC 2017 - aavindraa@gmail.com diff --git a/colordiff.spec b/colordiff.spec index 33bee3b..aeb0c34 100644 --- a/colordiff.spec +++ b/colordiff.spec @@ -1,7 +1,7 @@ # # spec file for package colordiff # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,21 +12,19 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: colordiff -Version: 1.0.18 +Version: 1.0.19 Release: 0 Summary: Colour-highlighted 'diff' output -License: GPL-2.0+ -Group: Productivity/Text/Utilities -Url: http://www.colordiff.org +License: GPL-2.0-or-later +URL: https://www.colordiff.org 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 BuildArch: noarch %description @@ -35,24 +33,19 @@ output but with pretty 'syntax' highlighting. Colour schemes can be customized. %prep -%setup -q -%patch0 +%autosetup %build %install -mkdir -p %{buildroot}/%{_bindir} -mkdir -p %{buildroot}/%{_sysconfdir} -make \ - INSTALL_DIR=%{buildroot}/%{_bindir} \ - MAN_DIR=%{buildroot}/%{_mandir}/man1 \ - ETC_DIR=%{buildroot}%{_sysconfdir} install -sed -i -e "s@%{buildroot}@@" %{buildroot}/%{_bindir}/colordiff -chmod a-x %{buildroot}/%{_mandir}/man1/colordiff.* +%make_install INSTALL_DIR=%{_bindir} \ + ETC_DIR=%{_sysconfdir} \ + MAN_DIR=%{_mandir}/man1 %files -%doc README COPYING CHANGES BUGS colordiffrc colordiffrc-lightbg -%config %{_sysconfdir}/colordiffrc +%license COPYING +%doc README CHANGES BUGS colordiffrc colordiffrc-lightbg colordiffrc-gitdiff +%config(noreplace) %{_sysconfdir}/colordiffrc %{_bindir}/cdiff %{_bindir}/colordiff %{_mandir}/man1/cdiff.1%{?ext_man}