commit colordiff for openSUSE:Factory
Hello community,
here is the log from the commit of package colordiff for openSUSE:Factory
checked in at 2020-07-15 15:04:10
Comparing /work/SRC/openSUSE:Factory/colordiff (Old)
and /work/SRC/openSUSE:Factory/.colordiff.new.3060 (New)
Package is "colordiff"
Wed Jul 15 15:04:10 2020 rev:22 rq:820781 version:1.0.19
Changes:
--- /work/SRC/openSUSE:Factory/colordiff/colordiff.changes 2017-09-11
16:23:36.357834474 +0200
+++ /work/SRC/openSUSE:Factory/.colordiff.new.3060/colordiff.changes
2020-07-15 15:04:35.415384890 +0200
@@ -1,0 +2,12 @@
+Mon Jul 13 08:56:10 UTC 2020 - Matthias Eliasson
+
+- 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
+
+---
Old:
colordiff-1.0.18.tar.gz
colordiff-1.0.18.tar.gz.sig
colordiff-fix-permission.diff
New:
colordiff-1.0.19.tar.gz
colordiff-1.0.19.tar.gz.sig
Other differences:
--
++ colordiff.spec ++
--- /var/tmp/diff_new_pack.K9ZlGV/_old 2020-07-15 15:04:36.967386404 +0200
+++ /var/tmp/diff_new_pack.K9ZlGV/_new 2020-07-15 15:04:36.971386407 +0200
@@ -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 @@
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}
++ colordiff-1.0.18.tar.gz -> colordiff-1.0.19.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/colordiff-1.0.18/CHANGES new/colordiff-1.0.19/CHANGES
--- old/colordiff-1.0.18/CHANGES2017-06-02 21:41:16.0 +0200
+++ new/colordiff-1.0.19/CHANGES2020-04-18 12:52:00.0 +0200
@@ -141,5 +141,11 @@
Fix regression which broke piping to less.
-# vim: tw=72
+Changes between 1.0.18 and 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.
+# vim: tw=72
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/colordiff-1.0.18/Makefile
new/colordiff-1.0.19/Makefile
--- old/colordiff-1.0.18/Makefile 2016-11-12 13:12:14.0 +0100
+++ new/colordiff-1.0.19/Makefile 2020-04-18 12:45:39.0 +0200
@@ -1,6 +1,7 @@
INSTALL_DIR?=/usr/local/bin
MAN_DIR?=/usr/local/man/man1
ETC_DIR?=/etc
+INSTALL?=install
VERSION=$(shell egrep '^my .version' colordiff.pl |cut -f 2 -d "'")
commit colordiff for openSUSE:Factory
Hello community,
here is the log from the commit of package colordiff for openSUSE:Factory
checked in at 2017-09-11 16:22:55
Comparing /work/SRC/openSUSE:Factory/colordiff (Old)
and /work/SRC/openSUSE:Factory/.colordiff.new (New)
Package is "colordiff"
Mon Sep 11 16:22:55 2017 rev:21 rq:523007 version:1.0.18
Changes:
--- /work/SRC/openSUSE:Factory/colordiff/colordiff.changes 2016-01-01
19:49:41.0 +0100
+++ /work/SRC/openSUSE:Factory/.colordiff.new/colordiff.changes 2017-09-11
16:23:36.357834474 +0200
@@ -1,0 +2,9 @@
+Sun Sep 10 15:41:24 UTC 2017 - aavind...@gmail.com
+
+- 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
+
+---
Old:
colordiff-1.0.16.tar.gz
colordiff-1.0.16.tar.gz.sig
New:
colordiff-1.0.18.tar.gz
colordiff-1.0.18.tar.gz.sig
Other differences:
--
++ colordiff.spec ++
--- /var/tmp/diff_new_pack.KkH4OM/_old 2017-09-11 16:23:36.849765399 +0200
+++ /var/tmp/diff_new_pack.KkH4OM/_new 2017-09-11 16:23:36.853764837 +0200
@@ -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 @@
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 @@
chmod a-x %{buildroot}/%{_mandir}/man1/colordiff.*
%files
-%defattr(-,root,root)
%doc README COPYING CHANGES BUGS colordiffrc colordiffrc-lightbg
%config %{_sysconfdir}/colordiffrc
%{_bindir}/cdiff
++ colordiff-1.0.16.tar.gz -> colordiff-1.0.18.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/colordiff-1.0.16/CHANGES new/colordiff-1.0.18/CHANGES
--- old/colordiff-1.0.16/CHANGES2015-10-25 16:04:01.0 +0100
+++ new/colordiff-1.0.18/CHANGES2017-06-02 21:41:16.0 +0200
@@ -132,5 +132,14 @@
Support for XDG_CONFIG_HOME (thanks Zhiming Wang), fewer deps for cdiff.sh and
fixes for diffy and diff-type specification (thanks Peter Wu).
+Changes between 1.0.16 and 1.0.17
+
+Ensure --color=no is honoured where appropriate, add --color-term-output-only
+plus minor fixes.
+
+Changes between 1.0.17 and 1.0.18
+
+Fix regression which broke piping to less.
+
# vim: tw=72
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/colordiff-1.0.16/Makefile
new/colordiff-1.0.18/Makefile
--- old/colordiff-1.0.16/Makefile 2015-06-23 22:35:04.0 +0200
+++ new/colordiff-1.0.18/Makefile 2016-11-12 13:12:14.0 +0100
@@ -1,6 +1,6 @@
-INSTALL_DIR=/usr/local/bin
-MAN_DIR=/usr/local/man/man1
-ETC_DIR=/etc
+INSTALL_DIR?=/usr/local/bin
+MAN_DIR?=/usr/local/man/man1
+ETC_DIR?=/etc
VERSION=$(shell egrep '^my .version' colordiff.pl |cut -f 2 -d "'")
DIST_FILES=COPYING INSTALL Makefile README \
colordiff.pl colordiffrc colordiffrc-lightbg cdiff.sh BUGS CHANGES
colordiff.1 \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/colordiff-1.0.16/colordiff.pl
new/colordiff-1.0.18/colordiff.pl
--- old/colordiff-1.0.16/colordiff.pl 2015-10-25 15:54:32.0 +0100
+++ new/colordiff-1.0.18/colordiff.pl 2017-06-02 21:41:27.0 +0200
@@ -5,7 +5,7 @@
# ColorDiff - a wrapper/replacement for 'diff' producing #
# colourful output #
# #
-# Copyright (C)2002-2015 Dave Ewart (da...@sungate.co.uk) #
+# Copyright (C)2002-2017 Dave Ewart (da...@sungate.co.uk) #
# #
# #
@@ -25,13 +25,13 @@
use Getopt::Long qw(:config pass_through no_auto_abbrev);
my $app_name = 'colordiff';
-my $version = '1.0.16';
+my $version = '1.0.18';
commit colordiff for openSUSE:Factory
Hello community,
here is the log from the commit of package colordiff for openSUSE:Factory
checked in at 2016-01-01 19:47:32
Comparing /work/SRC/openSUSE:Factory/colordiff (Old)
and /work/SRC/openSUSE:Factory/.colordiff.new (New)
Package is "colordiff"
Changes:
--- /work/SRC/openSUSE:Factory/colordiff/colordiff.changes 2015-08-07
00:24:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.colordiff.new/colordiff.changes 2016-01-01
19:49:41.0 +0100
@@ -1,0 +2,7 @@
+Fri Dec 25 14:03:43 UTC 2015 - mplus...@suse.com
+
+- Update to 1.0.16
+ * see attached CHANGES for details
+- Add gpg signature
+
+---
Old:
colordiff-1.0.15.tar.gz
New:
colordiff-1.0.16.tar.gz
colordiff-1.0.16.tar.gz.sig
colordiff.keyring
Other differences:
--
++ colordiff.spec ++
--- /var/tmp/diff_new_pack.VpTe1S/_old 2016-01-01 19:49:43.0 +0100
+++ /var/tmp/diff_new_pack.VpTe1S/_new 2016-01-01 19:49:43.0 +0100
@@ -17,13 +17,15 @@
Name: colordiff
-Version:1.0.15
+Version:1.0.16
Release:0
Summary:Colour-highlighted 'diff' output
License:GPL-2.0+
Group: Productivity/Text/Utilities
Url:http://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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -41,19 +43,21 @@
%install
mkdir -p %{buildroot}/%{_bindir}
-mkdir -p %{buildroot}/etc
-make INSTALL_DIR=%{buildroot}/%{_bindir} \
+mkdir -p %{buildroot}/%{_sysconfdir}
+make \
+ INSTALL_DIR=%{buildroot}/%{_bindir} \
MAN_DIR=%{buildroot}/%{_mandir}/man1 \
-ETC_DIR=%{buildroot}/etc install
-gzip %{buildroot}/%{_mandir}/man1/*.1
+ ETC_DIR=%{buildroot}%{_sysconfdir} install
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
-%{_bindir}/*
-%{_mandir}/man1/*
%config %{_sysconfdir}/colordiffrc
+%{_bindir}/cdiff
+%{_bindir}/colordiff
+%{_mandir}/man1/cdiff.1%{?ext_man}
+%{_mandir}/man1/colordiff.1%{?ext_man}
%changelog
++ colordiff-1.0.15.tar.gz -> colordiff-1.0.16.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/colordiff-1.0.15/CHANGES new/colordiff-1.0.16/CHANGES
--- old/colordiff-1.0.15/CHANGES2015-06-23 22:36:28.0 +0200
+++ new/colordiff-1.0.16/CHANGES2015-10-25 16:04:01.0 +0100
@@ -127,5 +127,10 @@
Missed gitdiff file from tarball, bumping version number for clarity.
+Changes between 1.0.15 and 1.0.16
+
+Support for XDG_CONFIG_HOME (thanks Zhiming Wang), fewer deps for cdiff.sh and
+fixes for diffy and diff-type specification (thanks Peter Wu).
+
# vim: tw=72
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/colordiff-1.0.15/cdiff.sh
new/colordiff-1.0.16/cdiff.sh
--- old/colordiff-1.0.15/cdiff.sh 2012-10-17 22:14:35.0 +0200
+++ new/colordiff-1.0.16/cdiff.sh 2015-06-25 15:37:54.0 +0200
@@ -2,7 +2,7 @@
# cdiff.sh - Convenience wrapper for colordiff
#
-# Copyright (C) 2003-2009 Ville Skyttä
+# Copyright (C) 2003-2015 Ville Skyttä
# Based on cdiff version 1.4 by eiv...@freebsd.org
#
# This program is free software; you can redistribute it and/or
@@ -30,15 +30,15 @@
case `echo "$file" | perl -ne 'print lc $_'` in
http:*|https:*|ftp:*)
if [ -z "$CDIFF_FETCH" ]; then
-if which curl >/dev/null 2>&1; then
+if type curl >/dev/null 2>&1; then
CDIFF_FETCH="curl -s"
-elif which wget >/dev/null 2>&1; then
+elif type wget >/dev/null 2>&1; then
CDIFF_FETCH="wget -e timestamping=off -qO -"
-elif which lwp-request >/dev/null 2>&1; then
+elif type lwp-request >/dev/null 2>&1; then
CDIFF_FETCH="lwp-request -m GET"
-elif which lynx >/dev/null 2>&1; then
+elif type lynx >/dev/null 2>&1; then
CDIFF_FETCH="lynx -source"
-elif which elinks >/dev/null 2>&1; then
+elif type elinks >/dev/null 2>&1; then
CDIFF_FETCH="elinks -source"
fi
if [ -z "$CDIFF_FETCH" ]; then
diff -urN
commit colordiff for openSUSE:Factory
Hello community,
here is the log from the commit of package colordiff for openSUSE:Factory
checked in at 2015-08-07 00:24:13
Comparing /work/SRC/openSUSE:Factory/colordiff (Old)
and /work/SRC/openSUSE:Factory/.colordiff.new (New)
Package is colordiff
Changes:
--- /work/SRC/openSUSE:Factory/colordiff/colordiff.changes 2015-03-30
19:34:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.colordiff.new/colordiff.changes 2015-08-07
00:24:14.0 +0200
@@ -1,0 +2,6 @@
+Wed Aug 5 14:25:05 UTC 2015 - mplus...@suse.com
+
+- Update to 1.0.15
+ * see attached CHANGES for details
+
+---
Old:
colordiff-1.0.13.tar.gz
New:
colordiff-1.0.15.tar.gz
Other differences:
--
++ colordiff.spec ++
--- /var/tmp/diff_new_pack.zZQ1fz/_old 2015-08-07 00:24:15.0 +0200
+++ /var/tmp/diff_new_pack.zZQ1fz/_new 2015-08-07 00:24:15.0 +0200
@@ -17,7 +17,7 @@
Name: colordiff
-Version:1.0.13
+Version:1.0.15
Release:0
Summary:Colour-highlighted 'diff' output
License:GPL-2.0+
++ colordiff-1.0.13.tar.gz - colordiff-1.0.15.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/colordiff-1.0.13/CHANGES new/colordiff-1.0.15/CHANGES
--- old/colordiff-1.0.13/CHANGES2012-11-14 10:36:31.0 +0100
+++ new/colordiff-1.0.15/CHANGES2015-06-23 22:36:28.0 +0200
@@ -117,5 +117,15 @@
Avoid accidentally identifying some diffs as side-by-side, handling colordiff
arguments better. Plus code refactoring, corrections to docs.
+Changes between version 1.0.13 and 1.0.14
+
+Big improvements to side-by-side diff detection, thanks Peter Wu. Additional
+colordiffrc example colour scheme file to match 'git diff'. Misc fixes thanks
+to John Szakmeister, Matthew Wang.
+
+Changes between 1.0.14 and 1.0.15
+
+Missed gitdiff file from tarball, bumping version number for clarity.
+
# vim: tw=72
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/colordiff-1.0.13/Makefile
new/colordiff-1.0.15/Makefile
--- old/colordiff-1.0.13/Makefile 2012-10-17 22:14:35.0 +0200
+++ new/colordiff-1.0.15/Makefile 2015-06-23 22:35:04.0 +0200
@@ -4,11 +4,11 @@
VERSION=$(shell egrep '^my .version' colordiff.pl |cut -f 2 -d ')
DIST_FILES=COPYING INSTALL Makefile README \
colordiff.pl colordiffrc colordiffrc-lightbg cdiff.sh BUGS CHANGES
colordiff.1 \
- colordiff.xml cdiff.xml cdiff.1
+ colordiff.xml cdiff.xml cdiff.1 colordiffrc-gitdiff
TMPDIR=colordiff-${VERSION}
TARBALL=${TMPDIR}.tar.gz
-
+.PHONY: doc
doc: colordiff.xml cdiff.xml
xmlto -vv man colordiff.xml
xmlto -vv man cdiff.xml
@@ -19,6 +19,7 @@
perl -p -i -e 's#/body#/div/body#' colordiff.html
perl -p -i -e 's#div class=\refentry\#div id=\content\div
class=\refentry\#' colordiff.html
+.PHONY: install
install:
install -d ${DESTDIR}${INSTALL_DIR}
sed -e s%/etc%${ETC_DIR}%g colordiff.pl \
@@ -39,6 +40,7 @@
-chown root.root ${DESTDIR}${ETC_DIR}/colordiffrc
chmod 644 ${DESTDIR}${ETC_DIR}/colordiffrc
+.PHONY: uninstall
uninstall:
rm -f ${DESTDIR}${INSTALL_DIR}/colordiff
rm -f ${DESTDIR}${ETC_DIR}/colordiffrc
@@ -46,14 +48,17 @@
rm -f ${DESTDIR}${MAN_DIR}/colordiff.1
rm -f ${DESTDIR}${MAN_DIR}/cdiff.1
+.PHONY: dist
dist:
mkdir ${TMPDIR}
cp -p ${DIST_FILES} ${TMPDIR}
tar -zcvf ${TARBALL} ${TMPDIR}
rm -fR ${TMPDIR}
+.PHONY: gitclean
gitclean:
rm -f colordiff.1 colordiff.html cdiff.1
+.PHONY: clean
clean:
rm -f README colordiff.1 colordiff.html cdiff.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/colordiff-1.0.13/README new/colordiff-1.0.15/README
--- old/colordiff-1.0.13/README 2012-11-14 10:50:32.0 +0100
+++ new/colordiff-1.0.15/README 2015-05-21 11:19:12.0 +0200
@@ -39,6 +39,11 @@
$ diff -u file1 file2 | colordiff | less -R
+If you want to force disable colour escape sequences (for example pipe the
+output to patch), you can use option '--color=no' to do so:
+
+$ diff -u file1 file2 | colordiff --color=no | patch -p0 -d another-working-dir
+
If you have wdiff installed, colordiff will correctly colourise the added and
removed text, provided that the '-n' option is given to wdiff:
@@ -70,6 +75,12 @@
Note that the function name, cvsdiff, can be customized.
+By default colordiff returns the exit code of the underlying diff invocation
+(if there is one), but there are some circumstances where it is
commit colordiff for openSUSE:Factory
Hello community,
here is the log from the commit of package colordiff for openSUSE:Factory
checked in at 2015-03-30 19:34:13
Comparing /work/SRC/openSUSE:Factory/colordiff (Old)
and /work/SRC/openSUSE:Factory/.colordiff.new (New)
Package is colordiff
Changes:
--- /work/SRC/openSUSE:Factory/colordiff/colordiff.changes 2012-02-16
14:55:30.0 +0100
+++ /work/SRC/openSUSE:Factory/.colordiff.new/colordiff.changes 2015-03-30
19:34:14.0 +0200
@@ -1,0 +2,9 @@
+Sat Mar 28 13:59:38 UTC 2015 - mplus...@suse.com
+
+- Update to 1.0.13
+ * see attached CHANGES for details
+- Cleanup spec-file with spec-cleaner
+- Update project url
+- Use url for source
+
+---
Old:
colordiff-1.0.9.tar.bz2
New:
colordiff-1.0.13.tar.gz
Other differences:
--
++ colordiff.spec ++
--- /var/tmp/diff_new_pack.sqfioe/_old 2015-03-30 19:34:14.0 +0200
+++ /var/tmp/diff_new_pack.sqfioe/_new 2015-03-30 19:34:14.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package colordiff
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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,15 +17,15 @@
Name: colordiff
-Url:http://colordiff.sourceforge.net/
-Version:1.0.9
+Version:1.0.13
Release:0
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary:Colour-highlighted 'diff' output
License:GPL-2.0+
Group: Productivity/Text/Utilities
-Source0:http://colordiff.sourceforge.net/%{name}-%{version}.tar.bz2
+Url:http://www.colordiff.org
+Source0:http://www.colordiff.org/%{name}-%{version}.tar.gz
Patch0: colordiff-fix-permission.diff
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -40,20 +40,20 @@
%build
%install
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-mkdir -p $RPM_BUILD_ROOT/etc
-make INSTALL_DIR=$RPM_BUILD_ROOT/%{_bindir} \
-MAN_DIR=$RPM_BUILD_ROOT/%{_mandir}/man1 \
-ETC_DIR=$RPM_BUILD_ROOT/etc install
-gzip $RPM_BUILD_ROOT/%{_mandir}/man1/*.1
-sed -i -e s@$RPM_BUILD_ROOT@@ $RPM_BUILD_ROOT/%{_bindir}/colordiff
-chmod a-x $RPM_BUILD_ROOT/%{_mandir}/man1/colordiff.*
+mkdir -p %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}/etc
+make INSTALL_DIR=%{buildroot}/%{_bindir} \
+MAN_DIR=%{buildroot}/%{_mandir}/man1 \
+ETC_DIR=%{buildroot}/etc install
+gzip %{buildroot}/%{_mandir}/man1/*.1
+sed -i -e s@%{buildroot}@@ %{buildroot}/%{_bindir}/colordiff
+chmod a-x %{buildroot}/%{_mandir}/man1/colordiff.*
%files
%defattr(-,root,root)
-%doc README TODO COPYING CHANGES BUGS colordiffrc colordiffrc-lightbg
+%doc README COPYING CHANGES BUGS colordiffrc colordiffrc-lightbg
%{_bindir}/*
%{_mandir}/man1/*
-%config /etc/colordiffrc
+%config %{_sysconfdir}/colordiffrc
%changelog
++ colordiff-fix-permission.diff ++
--- /var/tmp/diff_new_pack.sqfioe/_old 2015-03-30 19:34:14.0 +0200
+++ /var/tmp/diff_new_pack.sqfioe/_new 2015-03-30 19:34:14.0 +0200
@@ -1,6 +1,8 @@
Makefile
+Index: Makefile
+===
+--- Makefile.orig
+++ Makefile
-@@ -36,9 +36,7 @@
+@@ -35,9 +35,7 @@ install:
else \
install -d ${DESTDIR}${ETC_DIR}; \
fi
commit colordiff for openSUSE:Factory
Hello community,
here is the log from the commit of package colordiff for openSUSE:Factory
checked in at 2012-02-16 14:55:29
Comparing /work/SRC/openSUSE:Factory/colordiff (Old)
and /work/SRC/openSUSE:Factory/.colordiff.new (New)
Package is colordiff, Maintainer is mse...@novell.com
Changes:
--- /work/SRC/openSUSE:Factory/colordiff/colordiff.changes 2012-02-14
19:00:08.0 +0100
+++ /work/SRC/openSUSE:Factory/.colordiff.new/colordiff.changes 2012-02-16
14:55:30.0 +0100
@@ -1,0 +2,5 @@
+Mon Feb 13 10:45:11 UTC 2012 - co...@suse.com
+
+- patch license to follow spdx.org standard
+
+---
Other differences:
--
++ colordiff.spec ++
--- /var/tmp/diff_new_pack.IyVVDJ/_old 2012-02-16 14:55:31.0 +0100
+++ /var/tmp/diff_new_pack.IyVVDJ/_new 2012-02-16 14:55:31.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package colordiff
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,15 +16,14 @@
#
-
Name: colordiff
Url:http://colordiff.sourceforge.net/
Version:1.0.9
-Release:2
-License:GPL v2 or later
+Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Group: Productivity/Text/Utilities
Summary:Colour-highlighted 'diff' output
+License:GPL-2.0+
+Group: Productivity/Text/Utilities
Source0:http://colordiff.sourceforge.net/%{name}-%{version}.tar.bz2
Patch0: colordiff-fix-permission.diff
BuildArch: noarch
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit colordiff for openSUSE:Factory
Hello community,
here is the log from the commit of package colordiff for openSUSE:Factory
checked in at 2012-02-14 19:00:05
Comparing /work/SRC/openSUSE:Factory/colordiff (Old)
and /work/SRC/openSUSE:Factory/.colordiff.new (New)
Package is colordiff, Maintainer is mse...@novell.com
Changes:
--- /work/SRC/openSUSE:Factory/colordiff/colordiff.changes 2011-09-23
01:53:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.colordiff.new/colordiff.changes 2012-02-14
19:00:08.0 +0100
@@ -1,0 +2,5 @@
+Sat Sep 17 23:39:48 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant tags/sections from specfile
+
+---
Other differences:
--
++ colordiff.spec ++
--- /var/tmp/diff_new_pack.EKksPy/_old 2012-02-14 19:00:10.0 +0100
+++ /var/tmp/diff_new_pack.EKksPy/_new 2012-02-14 19:00:10.0 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package colordiff (Version 1.0.9)
+# spec file for package colordiff
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -34,12 +34,6 @@
output but with pretty 'syntax' highlighting. Colour schemes can be
customized.
-
-
-Authors:
-
-Dave Ewart da...@sungate.co.uk
-
%prep
%setup -q
%patch0
@@ -56,9 +50,6 @@
sed -i -e s@$RPM_BUILD_ROOT@@ $RPM_BUILD_ROOT/%{_bindir}/colordiff
chmod a-x $RPM_BUILD_ROOT/%{_mandir}/man1/colordiff.*
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
%doc README TODO COPYING CHANGES BUGS colordiffrc colordiffrc-lightbg
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
