richardfearn pushed to colordiff (el6). "Merge remote-tracking branch 'origin/f14' into el6"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 7 18:44:50 UTC 2015
>From 5cb4d89b282cd1854b18b6c8b9592d01088016f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop at fedoraproject.org>
Date: Wed, 4 Apr 2007 16:41:56 +0000
Subject: - 1.0.6.
diff --git a/branch b/branch
new file mode 100644
index 0000000..d5b6362
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+FC-6
--
cgit v0.10.2
>From cf04b91924429665a18129a9c53b97fa3fbe7215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop at fedoraproject.org>
Date: Wed, 4 Apr 2007 17:07:22 +0000
Subject: Hopefully final branch mess fixups.
diff --git a/branch b/branch
deleted file mode 100644
index d5b6362..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-FC-6
diff --git a/colordiff.spec b/colordiff.spec
index f0cd25c..a2571df 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -1,6 +1,6 @@
Name: colordiff
Version: 1.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Color terminal highlighter for diff files
Group: Applications/Text
@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Wed Apr 4 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6-1
+* Wed Apr 4 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6-2
- 1.0.6.
* Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.5-2
--
cgit v0.10.2
>From 5162c18b2eebcea84f5f7a55b108d06887b69094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop at fedoraproject.org>
Date: Sat, 12 May 2007 18:16:12 +0000
Subject: - 1.0.6a.
diff --git a/.cvsignore b/.cvsignore
index e8ee082..de82ed9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-colordiff-1.0.6.tar.gz
+colordiff-1.0.6a.tar.gz
diff --git a/colordiff-1.0.6-color_patches.patch b/colordiff-1.0.6-color_patches.patch
deleted file mode 100644
index 66160d6..0000000
--- a/colordiff-1.0.6-color_patches.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- colordiff-1.0.6/colordiff.pl~ 2006-09-13 22:37:24.000000000 +0300
-+++ colordiff-1.0.6/colordiff.pl 2007-04-04 18:45:36.000000000 +0300
-@@ -86,7 +86,7 @@
- }
- next;
- }
-- if ($setting eq 'color_patch') {
-+ if ($setting eq 'color_patches') {
- if ($value eq 'yes') {
- $color_patch = 1;
- }
diff --git a/colordiff.spec b/colordiff.spec
index a2571df..d398535 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -1,6 +1,6 @@
Name: colordiff
-Version: 1.0.6
-Release: 2%{?dist}
+Version: 1.0.6a
+Release: 1%{?dist}
Summary: Color terminal highlighter for diff files
Group: Applications/Text
@@ -8,7 +8,6 @@ License: GPL
URL: http://colordiff.sourceforge.net/
Source0: http://colordiff.sourceforge.net/%{name}-%{version}.tar.gz
Patch0: %{name}-1.0.6-colors.patch
-Patch1: %{name}-1.0.6-color_patches.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -26,7 +25,6 @@ pretty syntax highlighting. Color schemes can be customized.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
mv colordiffrc colordiffrc-darkbg
@@ -55,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat May 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-1
+- 1.0.6a.
+
* Wed Apr 4 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6-2
- 1.0.6.
diff --git a/sources b/sources
index e542ba3..4c61a01 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a27bfccc24cd9874eb1d1abe40dc2457 colordiff-1.0.6.tar.gz
+db49d0779a453c96f0859cd20b7b1aa9 colordiff-1.0.6a.tar.gz
--
cgit v0.10.2
>From 4cb74c94f6756f20cb70e730fa31e01dbd229abe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop at fedoraproject.org>
Date: Sat, 7 Jul 2007 19:29:58 +0000
Subject: - Convert docs to UTF-8.
diff --git a/colordiff.spec b/colordiff.spec
index d398535..dbc4eca 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -1,6 +1,6 @@
Name: colordiff
Version: 1.0.6a
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Color terminal highlighter for diff files
Group: Applications/Text
@@ -26,6 +26,7 @@ pretty syntax highlighting. Color schemes can be customized.
%setup -q
%patch0 -p1
mv colordiffrc colordiffrc-darkbg
+f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
%build
@@ -53,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jul 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-2
+- Convert docs to UTF-8.
+
* Sat May 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-1
- 1.0.6a.
--
cgit v0.10.2
>From 998a4515181d9402e3eae0ec0af42703226a210a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop at fedoraproject.org>
Date: Mon, 13 Aug 2007 19:38:09 +0000
Subject: - License: GPLv2+
diff --git a/colordiff.spec b/colordiff.spec
index dbc4eca..6133708 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -1,10 +1,10 @@
Name: colordiff
Version: 1.0.6a
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Color terminal highlighter for diff files
Group: Applications/Text
-License: GPL
+License: GPLv2+
URL: http://colordiff.sourceforge.net/
Source0: http://colordiff.sourceforge.net/%{name}-%{version}.tar.gz
Patch0: %{name}-1.0.6-colors.patch
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Aug 13 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-3
+- License: GPLv2+
+
* Sat Jul 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-2
- Convert docs to UTF-8.
--
cgit v0.10.2
>From 70c9a389aa68df69ce7fd8819db2fcff5d7ffbb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop at fedoraproject.org>
Date: Sat, 29 Sep 2007 18:14:35 +0000
Subject: - Requires: which
diff --git a/colordiff.spec b/colordiff.spec
index 6133708..deaa09b 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -1,6 +1,6 @@
Name: colordiff
Version: 1.0.6a
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Color terminal highlighter for diff files
Group: Applications/Text
@@ -15,6 +15,7 @@ Requires: bzip2
Requires: gzip
Requires: less
Requires: diffutils
+Requires: which
Provides: cdiff
%description
@@ -54,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Sep 29 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-4
+- Requires: which
+
* Mon Aug 13 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-3
- License: GPLv2+
--
cgit v0.10.2
>From 0630fe6e81fcb3b6b8a97450db142e73a7364a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop at fedoraproject.org>
Date: Mon, 5 Nov 2007 22:21:28 +0000
Subject: - 1.0.7.
diff --git a/.cvsignore b/.cvsignore
index de82ed9..2df434a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-colordiff-1.0.6a.tar.gz
+colordiff-1.0.7.tar.gz
diff --git a/colordiff.spec b/colordiff.spec
index deaa09b..be33d8e 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -1,6 +1,6 @@
Name: colordiff
-Version: 1.0.6a
-Release: 4%{?dist}
+Version: 1.0.7
+Release: 1%{?dist}
Summary: Color terminal highlighter for diff files
Group: Applications/Text
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Nov 6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.7-1
+- 1.0.7.
+
* Sat Sep 29 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.6a-4
- Requires: which
diff --git a/sources b/sources
index 4c61a01..b766a58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db49d0779a453c96f0859cd20b7b1aa9 colordiff-1.0.6a.tar.gz
+a9d42a12e9447fecafbace3e17c779c8 colordiff-1.0.7.tar.gz
--
cgit v0.10.2
>From d48148e30c8ff0695552b7fea96898bf3ac4a29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop at fedoraproject.org>
Date: Tue, 6 Nov 2007 19:30:51 +0000
Subject: - Upstream brown paper bag 1.0.7 re-release.
diff --git a/colordiff.spec b/colordiff.spec
index be33d8e..b5b8532 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -1,6 +1,6 @@
Name: colordiff
Version: 1.0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Color terminal highlighter for diff files
Group: Applications/Text
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Nov 6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.7-2
+- Upstream brown paper bag 1.0.7 re-release.
+
* Tue Nov 6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.7-1
- 1.0.7.
diff --git a/sources b/sources
index b766a58..bebc374 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9d42a12e9447fecafbace3e17c779c8 colordiff-1.0.7.tar.gz
+940d4d1c388e66d352bce0887a39a3c5 colordiff-1.0.7.tar.gz
--
cgit v0.10.2
>From 452e5cb1e8a06e5dd9b6b0b62048742ddc577af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop at fedoraproject.org>
Date: Thu, 10 Apr 2008 20:08:51 +0000
Subject: - Patch to work around wget 1.11 regression, prefer curl over wget
(#441862). - Drop disttag.
diff --git a/colordiff-1.0.7-wget111-441862.patch b/colordiff-1.0.7-wget111-441862.patch
new file mode 100644
index 0000000..1d92656
--- /dev/null
+++ b/colordiff-1.0.7-wget111-441862.patch
@@ -0,0 +1,19 @@
+https://savannah.gnu.org/bugs/?22896
+
+diff -up colordiff-1.0.7/cdiff.sh~ colordiff-1.0.7/cdiff.sh
+--- colordiff-1.0.7/cdiff.sh~ 2005-03-28 22:33:07.000000000 +0300
++++ colordiff-1.0.7/cdiff.sh 2008-04-10 22:09:47.000000000 +0300
+@@ -33,10 +33,10 @@
+ case `echo "$file" | perl -ne 'print lc $_'` in
+ http:*|https:*|ftp:*)
+ if [ -z "$CDIFF_FETCH" ]; then
+- if which wget >/dev/null 2>&1; then
+- CDIFF_FETCH="wget -qO -"
+- elif which curl >/dev/null 2>&1; then
++ if which curl >/dev/null 2>&1; then
+ CDIFF_FETCH="curl -s"
++ elif which wget >/dev/null 2>&1; then
++ CDIFF_FETCH="wget -e timestamping=off -qO -"
+ elif which lwp-request >/dev/null 2>&1; then
+ CDIFF_FETCH="lwp-request -m GET"
+ elif which lynx >/dev/null 2>&1; then
diff --git a/colordiff.spec b/colordiff.spec
index b5b8532..37ec471 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -1,6 +1,6 @@
Name: colordiff
Version: 1.0.7
-Release: 2%{?dist}
+Release: 3
Summary: Color terminal highlighter for diff files
Group: Applications/Text
@@ -8,6 +8,7 @@ License: GPLv2+
URL: http://colordiff.sourceforge.net/
Source0: http://colordiff.sourceforge.net/%{name}-%{version}.tar.gz
Patch0: %{name}-1.0.6-colors.patch
+Patch1: %{name}-1.0.7-wget111-441862.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -26,6 +27,7 @@ pretty syntax highlighting. Color schemes can be customized.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
mv colordiffrc colordiffrc-darkbg
f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
@@ -55,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* 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.
+
* Tue Nov 6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.7-2
- Upstream brown paper bag 1.0.7 re-release.
--
cgit v0.10.2
>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
>From e600d36edc8ba691ac76f6101be5ec531678af8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop at fedoraproject.org>
Date: Mon, 26 Jan 2009 21:18:38 +0000
Subject: - Fix man page permissions.
diff --git a/colordiff-1.0.8a-destdir.patch b/colordiff-1.0.8a-destdir.patch
index fda3a6d..9b6c47f 100644
--- a/colordiff-1.0.8a-destdir.patch
+++ b/colordiff-1.0.8a-destdir.patch
@@ -24,8 +24,8 @@ diff -up colordiff-1.0.8a/Makefile~ colordiff-1.0.8a/Makefile
- 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
++ install -Dm 644 colordiff.1 ${DESTDIR}${MAN_DIR}/colordiff.1
++ install -m 644 cdiff.1 ${DESTDIR}${MAN_DIR}
+ if [ -f ${DESTDIR}${ETC_DIR}/colordiffrc ]; then \
+ mv -f ${DESTDIR}${ETC_DIR}/colordiffrc \
+ ${DESTDIR}${ETC_DIR}/colordiffrc.old; \
diff --git a/colordiff.spec b/colordiff.spec
index c3e65b6..417b4e1 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -1,6 +1,6 @@
Name: colordiff
Version: 1.0.8a
-Release: 1
+Release: 2
Summary: Color terminal highlighter for diff files
Group: Applications/Text
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jan 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8a-2
+- Fix man page permissions.
+
* Mon Jan 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8a-1
- 1.0.8a.
- Patch Makefile for DESTDIR support.
--
cgit v0.10.2
>From 05cc319da115a22634a8895e2c83ec4a3602e601 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at fedoraproject.org>
Date: Tue, 24 Feb 2009 08:22:50 +0000
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/colordiff.spec b/colordiff.spec
index 417b4e1..5f67ae1 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -1,6 +1,6 @@
Name: colordiff
Version: 1.0.8a
-Release: 2
+Release: 3
Summary: Color terminal highlighter for diff files
Group: Applications/Text
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8a-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Mon Jan 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8a-2
- Fix man page permissions.
--
cgit v0.10.2
>From 56dc5a8dd463b006556b4eb699bbf5f4faeb706b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop at fedoraproject.org>
Date: Mon, 20 Jul 2009 21:25:13 +0000
Subject: - Update to 1.0.9; wget 1.11, lzma and destdir patches applied
upstream. - Patch cdiff for xz support.
diff --git a/.cvsignore b/.cvsignore
index bf32668..b04ba7a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-colordiff-1.0.8a.tar.gz
+colordiff-1.0.9.tar.gz
diff --git a/colordiff-1.0.7-wget111-441862.patch b/colordiff-1.0.7-wget111-441862.patch
deleted file mode 100644
index 1d92656..0000000
--- a/colordiff-1.0.7-wget111-441862.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://savannah.gnu.org/bugs/?22896
-
-diff -up colordiff-1.0.7/cdiff.sh~ colordiff-1.0.7/cdiff.sh
---- colordiff-1.0.7/cdiff.sh~ 2005-03-28 22:33:07.000000000 +0300
-+++ colordiff-1.0.7/cdiff.sh 2008-04-10 22:09:47.000000000 +0300
-@@ -33,10 +33,10 @@
- case `echo "$file" | perl -ne 'print lc $_'` in
- http:*|https:*|ftp:*)
- if [ -z "$CDIFF_FETCH" ]; then
-- if which wget >/dev/null 2>&1; then
-- CDIFF_FETCH="wget -qO -"
-- elif which curl >/dev/null 2>&1; then
-+ if which curl >/dev/null 2>&1; then
- CDIFF_FETCH="curl -s"
-+ elif which wget >/dev/null 2>&1; then
-+ CDIFF_FETCH="wget -e timestamping=off -qO -"
- elif which lwp-request >/dev/null 2>&1; then
- CDIFF_FETCH="lwp-request -m GET"
- elif which lynx >/dev/null 2>&1; then
diff --git a/colordiff-1.0.8a-cdiff.patch b/colordiff-1.0.8a-cdiff.patch
deleted file mode 100644
index 53e5b05..0000000
--- a/colordiff-1.0.8a-cdiff.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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
deleted file mode 100644
index 9b6c47f..0000000
--- a/colordiff-1.0.8a-destdir.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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 -Dm 644 colordiff.1 ${DESTDIR}${MAN_DIR}/colordiff.1
-+ install -m 644 cdiff.1 ${DESTDIR}${MAN_DIR}
-+ 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-1.0.9-cdiff-xz.patch b/colordiff-1.0.9-cdiff-xz.patch
new file mode 100644
index 0000000..5562301
--- /dev/null
+++ b/colordiff-1.0.9-cdiff-xz.patch
@@ -0,0 +1,36 @@
+diff -up colordiff-1.0.9/cdiff.sh~ colordiff-1.0.9/cdiff.sh
+--- colordiff-1.0.9/cdiff.sh~ 2009-01-26 22:17:47.000000000 +0200
++++ colordiff-1.0.9/cdiff.sh 2009-07-21 00:20:05.000000000 +0300
+@@ -2,7 +2,7 @@
+
+ # cdiff.sh - Convenience wrapper for colordiff
+ #
+-# Copyright (C) 2003-2004 Ville Skyttä <ville.skytta at iki.fi>
++# Copyright (C) 2003-2009 Ville Skyttä <ville.skytta at iki.fi>
+ # Based on cdiff version 1.4 by eivind at FreeBSD.org
+ #
+ # This program is free software; you can redistribute it and/or
+@@ -24,6 +24,7 @@
+ file=`echo "$1" | perl -pe 's|^file:/+|/|i'`
+ case "$file" in
+ *.bz2) cat="bzip2 -dcf" ;;
++ *.xz) cat="xz -dc" ;;
+ *.lzma) cat="lzma -dc" ;;
+ *) cat="gzip -dcf" ;;
+ esac
+diff -up colordiff-1.0.9/cdiff.xml~ colordiff-1.0.9/cdiff.xml
+--- colordiff-1.0.9/cdiff.xml~ 2009-01-26 22:16:44.000000000 +0200
++++ colordiff-1.0.9/cdiff.xml 2009-07-21 00:11:58.000000000 +0300
+@@ -35,9 +35,9 @@ in a URL or a file, e.g.</para>
+ 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
++<para>It also adds support for reading gzip, bzip2, xz, 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>
diff --git a/colordiff.spec b/colordiff.spec
index 5f67ae1..b27d812 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -1,6 +1,6 @@
Name: colordiff
-Version: 1.0.8a
-Release: 3
+Version: 1.0.9
+Release: 1%{?dist}
Summary: Color terminal highlighter for diff files
Group: Applications/Text
@@ -9,18 +9,15 @@ 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
+# Sent upstream 2009-07-21
+Patch1: %{name}-1.0.9-cdiff-xz.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-# xmlto, docbook-dtds for patch3
+# xmlto, docbook-dtds for patch1
BuildRequires: xmlto, docbook-dtd412-xml
Requires: lzma
+Requires: xz
Requires: bzip2
Requires: gzip
Requires: less
@@ -37,8 +34,6 @@ pretty syntax highlighting. Color schemes can be customized.
%setup -q
%patch0 -p1
%patch1 -p1
-%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
@@ -68,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jul 21 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.9-1
+- Update to 1.0.9; wget 1.11, lzma and destdir patches applied upstream.
+- Patch cdiff for xz support.
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8a-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/sources b/sources
index f68d51b..fd45530 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2355debed9a9a0183c33ef27c62feb3b colordiff-1.0.8a.tar.gz
+31864847eaa4e900f72bbb6bbc64f1ec colordiff-1.0.9.tar.gz
--
cgit v0.10.2
>From 54d88fea078ea588482637956b605facf450a5ac Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at fedoraproject.org>
Date: Fri, 24 Jul 2009 19:15:01 +0000
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/colordiff.spec b/colordiff.spec
index b27d812..2b1dbcc 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -1,6 +1,6 @@
Name: colordiff
Version: 1.0.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Color terminal highlighter for diff files
Group: Applications/Text
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Tue Jul 21 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.9-1
- Update to 1.0.9; wget 1.11, lzma and destdir patches applied upstream.
- Patch cdiff for xz support.
--
cgit v0.10.2
>From 57ffdd43a332445f655a2e7a89b33873d9b7da86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop at fedoraproject.org>
Date: Wed, 29 Jul 2009 18:48:13 +0000
Subject: - Update cdiff xz patch to use xz also for lzma files.
diff --git a/colordiff-1.0.9-cdiff-xz.patch b/colordiff-1.0.9-cdiff-xz.patch
index 5562301..ceeeb45 100644
--- a/colordiff-1.0.9-cdiff-xz.patch
+++ b/colordiff-1.0.9-cdiff-xz.patch
@@ -1,6 +1,6 @@
diff -up colordiff-1.0.9/cdiff.sh~ colordiff-1.0.9/cdiff.sh
--- colordiff-1.0.9/cdiff.sh~ 2009-01-26 22:17:47.000000000 +0200
-+++ colordiff-1.0.9/cdiff.sh 2009-07-21 00:20:05.000000000 +0300
++++ colordiff-1.0.9/cdiff.sh 2009-07-29 21:36:42.000000000 +0300
@@ -2,7 +2,7 @@
# cdiff.sh - Convenience wrapper for colordiff
@@ -10,17 +10,22 @@ diff -up colordiff-1.0.9/cdiff.sh~ colordiff-1.0.9/cdiff.sh
# Based on cdiff version 1.4 by eivind at FreeBSD.org
#
# This program is free software; you can redistribute it and/or
-@@ -24,6 +24,7 @@
+@@ -23,9 +23,9 @@
+ while [ "$1" != "" ]; do
file=`echo "$1" | perl -pe 's|^file:/+|/|i'`
case "$file" in
- *.bz2) cat="bzip2 -dcf" ;;
-+ *.xz) cat="xz -dc" ;;
- *.lzma) cat="lzma -dc" ;;
- *) cat="gzip -dcf" ;;
+- *.bz2) cat="bzip2 -dcf" ;;
+- *.lzma) cat="lzma -dc" ;;
+- *) cat="gzip -dcf" ;;
++ *.bz2) cat="bzip2 -dcf" ;;
++ *.xz|*.lzma) cat="xz -dc" ;;
++ *) cat="gzip -dcf" ;;
esac
+ case `echo "$file" | perl -ne 'print lc $_'` in
+ http:*|https:*|ftp:*)
diff -up colordiff-1.0.9/cdiff.xml~ colordiff-1.0.9/cdiff.xml
--- colordiff-1.0.9/cdiff.xml~ 2009-01-26 22:16:44.000000000 +0200
-+++ colordiff-1.0.9/cdiff.xml 2009-07-21 00:11:58.000000000 +0300
++++ colordiff-1.0.9/cdiff.xml 2009-07-29 21:37:08.000000000 +0300
@@ -35,9 +35,9 @@ in a URL or a file, e.g.</para>
cdiff http://some.url.com/foo/thing.patch
</screen>
diff --git a/colordiff.spec b/colordiff.spec
index 2b1dbcc..defb46f 100644
--- a/colordiff.spec
+++ b/colordiff.spec
@@ -1,6 +1,6 @@
Name: colordiff
Version: 1.0.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Color terminal highlighter for diff files
Group: Applications/Text
@@ -16,7 +16,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
# xmlto, docbook-dtds for patch1
BuildRequires: xmlto, docbook-dtd412-xml
-Requires: lzma
Requires: xz
Requires: bzip2
Requires: gzip
@@ -63,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jul 29 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.0.9-3
+- Update cdiff xz patch to use xz also for lzma files.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--
cgit v0.10.2
>From 174f28f39a37b213b8b9a515b5763f2772b4bb87 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting at fedoraproject.org>
Date: Wed, 25 Nov 2009 22:47:34 +0000
Subject: Fix typo that causes a failure to update the common directory.
(releng #2781)
diff --git a/Makefile b/Makefile
index dd575b1..39bc66f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
# Makefile for source rpm: colordiff
-# $Id$
+# $Id: Makefile,v 1.1 2005/05/21 08:42:17 scop Exp $
NAME := colordiff
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
--
cgit v0.10.2
>From 1c5877e65541a4f66edaa1752fd2081b35a6f417 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 11:56:33 +0000
Subject: dist-git conversion
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index b04ba7a..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-colordiff-1.0.9.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b04ba7a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+colordiff-1.0.9.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 39bc66f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: colordiff
-# $Id: Makefile,v 1.1 2005/05/21 08:42:17 scop Exp $
-NAME := colordiff
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/colordiff.git/commit/?h=el6&id=6b3339b35990ff53510e6528aceb4112267d630f
More information about the scm-commits
mailing list