OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Jun-2004 17:11:09
Branch: HEAD Handle: -NONE-
Added files:
openpkg-src/cvs2cl cvs2cl.patch
Modified files:
openpkg-src/cvs2cl cvs2cl.spec
Log:
support both CVS 1.11 and 1.12 outputs
Summary:
Revision Changes Path
1.1 +18 -0 openpkg-src/cvs2cl/cvs2cl.patch
1.13 +4 -1 openpkg-src/cvs2cl/cvs2cl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvs2cl/cvs2cl.patch
============================================================================
$ cvs diff -u -r0 -r1.1 cvs2cl.patch
--- /dev/null 2004-06-27 17:11:09.000000000 +0200
+++ cvs2cl.patch 2004-06-27 17:11:09.000000000 +0200
@@ -0,0 +1,18 @@
+Index: cvs2cl.pl
+--- cvs2cl.pl.orig 2004-06-27 17:04:14 +0200
++++ cvs2cl.pl 2004-06-27 17:07:23 +0200
+@@ -2282,11 +2282,12 @@
+ my ($self, $line) = @_;
+ # Parses the date/time and author out of a line like:
+ #
+- # date: 1999/02/19 23:29:05; author: apharris; state: Exp;
++ # CVS 1.11.x: date: 1999/02/19 23:29:05; author: apharris; state: Exp;
++ # CVS 1.12.x: date: 1999-02-19 23:29:05 +0200; author: apharris; state: Exp;
+
+ my ($year, $mon, $mday, $hours, $min, $secs, $author, $state, $rest) =
+ $line =~
+- m!(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);\s+
++ m!(\d+)[/-](\d+)[/-](\d+)\s+(\d+):(\d+):(\d+)(?:\s+[+-]?\d+)?;\s+
+ author:\s+([^;]+);\s+state:\s+([^;]+);(.*)!x
+ or die "Couldn't parse date ``$line''";
+ die "Bad date or Y2K issues"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvs2cl/cvs2cl.spec
============================================================================
$ cvs diff -u -r1.12 -r1.13 cvs2cl.spec
--- openpkg-src/cvs2cl/cvs2cl.spec 27 Jun 2004 15:00:24 -0000 1.12
+++ openpkg-src/cvs2cl/cvs2cl.spec 27 Jun 2004 15:11:09 -0000 1.13
@@ -38,6 +38,7 @@
# list of sources
Source0: http://www.red-bean.com/cvs2cl/cvs2cl.pl
+Patch0: cvs2cl.patch
# build information
Prefix: %{l_prefix}
@@ -63,9 +64,11 @@
%prep
%setup -q -c -T
+ cp %{SOURCE cvs2cl.pl} .
+ %patch -p0
%build
- pod2man --section=1 %{SOURCE cvs2cl.pl} >cvs2cl.1
+ pod2man --section=1 cvs2cl.pl >cvs2cl.1
%install
rm -rf $RPM_BUILD_ROOT
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
