richardfearn pushed to colordiff (el6). "- 1.0.8a. (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 7 18:43:48 UTC 2015
>From 55d5686fd6d96ab6b524fe9f64da94e2914f9c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop at fedoraproject.org>
Date: Mon, 26 Jan 2009 17:29:17 +0000
Subject: - 1.0.8a. - Patch Makefile for DESTDIR support. - Patch cdiff for
lzma support, man page improvements.
diff --git a/.cvsignore b/.cvsignore
index 2df434a..bf32668 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-colordiff-1.0.7.tar.gz
+colordiff-1.0.8a.tar.gz
diff --git a/colordiff-1.0.8a-cdiff.patch b/colordiff-1.0.8a-cdiff.patch
new file mode 100644
index 0000000..53e5b05
--- /dev/null
+++ b/colordiff-1.0.8a-cdiff.patch
@@ -0,0 +1,49 @@
+diff -up colordiff-1.0.8a/cdiff.sh~ colordiff-1.0.8a/cdiff.sh
+--- colordiff-1.0.8a/cdiff.sh~ 2005-03-28 22:33:07.000000000 +0300
++++ colordiff-1.0.8a/cdiff.sh 2009-01-26 19:03:48.000000000 +0200
+@@ -23,12 +23,9 @@
+ while [ "$1" != "" ]; do
+ file=`echo "$1" | perl -pe 's|^file:/+|/|i'`
+ case "$file" in
+- *.bz2)
+- cat="bzcat"
+- ;;
+- *)
+- cat="zcat -f"
+- ;;
++ *.bz2) cat="bzip2 -dcf" ;;
++ *.lzma) cat="lzma -dc" ;;
++ *) cat="gzip -dcf" ;;
+ esac
+ case `echo "$file" | perl -ne 'print lc $_'` in
+ http:*|https:*|ftp:*)
+diff -up colordiff-1.0.8a/cdiff.xml~ colordiff-1.0.8a/cdiff.xml
+--- colordiff-1.0.8a/cdiff.xml~ 2009-01-25 13:18:50.000000000 +0200
++++ colordiff-1.0.8a/cdiff.xml 2009-01-26 19:04:56.000000000 +0200
+@@ -22,19 +22,24 @@
+ <refsynopsisdiv id='synopsis'>
+ <cmdsynopsis>
+ <command>cdiff</command>
+- <arg choice='req'><replaceable>URL</replaceable></arg>
++ <arg choice='req'><replaceable>URL|FILE</replaceable></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsect1 id='description'><title>Description</title>
+
+ <para>&cdiff; is a wrapper for colordiff and will add colour to a diff given
+-in a URL, e.g.</para>
++in a URL or a file, e.g.</para>
+
+ <screen>
+ cdiff http://some.url.com/foo/thing.patch
+ </screen>
+
++<para>It also adds support for reading gzip, bzip2 and lzma compressed diffs,
++and like colordiff, also supports reading diffs from standard input if URL
++or a filename is not specified. &cdiff; pipes colordiff's output through
++less -R.</para>
++
+ </refsect1>
+
+ <refsect1 id='seealso'><title>See Also</title>
diff --git a/colordiff-1.0.8a-destdir.patch b/colordiff-1.0.8a-destdir.patch
new file mode 100644
index 0000000..fda3a6d
--- /dev/null
+++ b/colordiff-1.0.8a-destdir.patch
@@ -0,0 +1,55 @@
+diff -up colordiff-1.0.8a/Makefile~ colordiff-1.0.8a/Makefile
+--- colordiff-1.0.8a/Makefile~ 2009-01-25 20:54:04.000000000 +0200
++++ colordiff-1.0.8a/Makefile 2009-01-26 19:16:16.000000000 +0200
+@@ -20,28 +20,32 @@ doc: colordiff.xml cdiff.xml
+ perl -p -i -e 's#<div class=\"refentry\"#<div id=\"content\"><div class=\"refentry\"#' colordiff.html
+ mv colordiff.html ../htdocs
+
+-etc:
+- sed -e "s%/etc%$(ETC_DIR)%g" colordiff.pl > colordiff.pl.for.install
+-
+-install: etc
+- install -D colordiff.pl.for.install ${INSTALL_DIR}/colordiff
+- if [ ! -f ${INSTALL_DIR}/cdiff ] ; then \
+- install cdiff.sh ${INSTALL_DIR}/cdiff; \
++install:
++ install -d ${DESTDIR}${INSTALL_DIR}
++ sed -e "s%/etc%${ETC_DIR}%g" colordiff.pl > \
++ ${DESTDIR}${INSTALL_DIR}/colordiff
++ chmod +x ${DESTDIR}${INSTALL_DIR}/colordiff
++ if [ ! -f ${DESTDIR}${INSTALL_DIR}/cdiff ] ; then \
++ install cdiff.sh ${DESTDIR}${INSTALL_DIR}/cdiff; \
+ fi
+- install -D colordiff.1 ${MAN_DIR}/colordiff.1
+- install -D cdiff.1 ${MAN_DIR}/cdiff.1
+- if [ -f ${ETC_DIR}/colordiffrc ]; then \
+- mv -f ${ETC_DIR}/colordiffrc ${ETC_DIR}/colordiffrc.old; \
++ install -D colordiff.1 ${DESTDIR}${MAN_DIR}/colordiff.1
++ install -D cdiff.1 ${DESTDIR}${MAN_DIR}/cdiff.1
++ if [ -f ${DESTDIR}${ETC_DIR}/colordiffrc ]; then \
++ mv -f ${DESTDIR}${ETC_DIR}/colordiffrc \
++ ${DESTDIR}${ETC_DIR}/colordiffrc.old; \
++ else \
++ install -d ${DESTDIR}${ETC_DIR}; \
+ fi
+- cp colordiffrc ${ETC_DIR}/colordiffrc
+- chown root.root ${ETC_DIR}/colordiffrc
+- chmod 644 ${ETC_DIR}/colordiffrc
+- rm -f colordiff.pl.for.install
++ cp colordiffrc ${DESTDIR}${ETC_DIR}/colordiffrc
++ -chown root.root ${DESTDIR}${ETC_DIR}/colordiffrc
++ chmod 644 ${DESTDIR}${ETC_DIR}/colordiffrc
+
+-uninstall: etc
+- rm -f ${INSTALL_DIR}/colordiff
+- rm -f ${ETC_DIR}/colordiffrc
+- rm -f ${INSTALL_DIR}/cdiff
++uninstall:
++ rm -f ${DESTDIR}${INSTALL_DIR}/colordiff
++ rm -f ${DESTDIR}${ETC_DIR}/colordiffrc
++ rm -f ${DESTDIR}${INSTALL_DIR}/cdiff
++ rm -f ${DESTDIR}${MAN_DIR}/colordiff.1
++ rm -f ${DESTDIR}${MAN_DIR}/cdiff.1
+
+ dist:
+ mkdir ${TMPDIR}
diff --git a/colordiff.spec b/colordiff.spec
index 37ec471..c3e65b6 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -1,17 +1,26 @@
Name: colordiff
-Version: 1.0.7
-Release: 3
+Version: 1.0.8a
+Release: 1
Summary: Color terminal highlighter for diff files
Group: Applications/Text
License: GPLv2+
URL: http://colordiff.sourceforge.net/
Source0: http://colordiff.sourceforge.net/%{name}-%{version}.tar.gz
+# Non-upstream, better default colors for Fedora default desktop themes
Patch0: %{name}-1.0.6-colors.patch
+# Sent upstream 2008-04-??
Patch1: %{name}-1.0.7-wget111-441862.patch
+# Sent upstream 2009-01-26
+Patch2: %{name}-1.0.8a-destdir.patch
+# Sent upstream 2009-01-26
+Patch3: %{name}-1.0.8a-cdiff.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
+# xmlto, docbook-dtds for patch3
+BuildRequires: xmlto, docbook-dtd412-xml
+Requires: lzma
Requires: bzip2
Requires: gzip
Requires: less
@@ -28,19 +37,20 @@ pretty syntax highlighting. Color schemes can be customized.
%setup -q
%patch0 -p1
%patch1 -p1
-mv colordiffrc colordiffrc-darkbg
+%patch2 -p1
+%patch3 -p1
+mv colordiffrc colordiffrc-darkbg ; cp -p colordiffrc-lightbg colordiffrc
f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
%build
+xmlto -vv man cdiff.xml
%install
rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 colordiff.pl $RPM_BUILD_ROOT%{_bindir}/colordiff
-install -pm 755 cdiff.sh $RPM_BUILD_ROOT%{_bindir}/cdiff
-install -Dpm 644 colordiff.1 $RPM_BUILD_ROOT%{_mandir}/man1/colordiff.1
-install -Dpm 644 colordiffrc-lightbg $RPM_BUILD_ROOT%{_sysconfdir}/colordiffrc
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL_DIR=%{_bindir} \
+ ETC_DIR=%{_sysconfdir} MAN_DIR=%{_mandir}/man1
%clean
@@ -53,10 +63,16 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/colordiffrc
%{_bindir}/cdiff
%{_bindir}/colordiff
+%{_mandir}/man1/cdiff.1*
%{_mandir}/man1/colordiff.1*
%changelog
+* Mon Jan 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8a-1
+- 1.0.8a.
+- Patch Makefile for DESTDIR support.
+- Patch cdiff for lzma support, man page improvements.
+
* Thu Apr 10 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.0.7-3
- Patch to work around wget 1.11 regression, prefer curl over wget (#441862).
- Drop disttag.
diff --git a/sources b/sources
index bebc374..f68d51b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-940d4d1c388e66d352bce0887a39a3c5 colordiff-1.0.7.tar.gz
+2355debed9a9a0183c33ef27c62feb3b colordiff-1.0.8a.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/colordiff.git/commit/?h=el6&id=55d5686fd6d96ab6b524fe9f64da94e2914f9c80
More information about the scm-commits
mailing list