Accepting request 820781 from devel:tools

OBS-URL: https://build.opensuse.org/request/show/820781
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/colordiff?expand=0&rev=22

colordiff-1.0.18.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:29cfecd8854d6e19c96182ee13706b84622d7b256077df19fbd6a5452c30d6e0
-size 21695

colordiff-1.0.19.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46e8c14d87f6c4b77a273cdd97020fda88d5b2be42cf015d5d84aca3dfff3b19
+size 21329

colordiff-fix-permission.diff

@@ -1,15 +0,0 @@
-Index: Makefile
-===================================================================
---- Makefile.orig
-+++ Makefile
-@@ -36,9 +36,7 @@ install:
- 	else \
- 	  install -d ${DESTDIR}${ETC_DIR}; \
- 	fi
--	cp colordiffrc ${DESTDIR}${ETC_DIR}/colordiffrc
--	-chown root.root ${DESTDIR}${ETC_DIR}/colordiffrc
--	chmod 644 ${DESTDIR}${ETC_DIR}/colordiffrc
-+	install -m 644 colordiffrc ${ETC_DIR}/colordiffrc
- 
- .PHONY: uninstall
- uninstall:

colordiff.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Jul 13 08:56:10 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
+
+- 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
 

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}