From: Elan Ruusamäe <glen@pld-linux.org>
Date: Mon, 31 Jan 2011 07:47:10 +0000 (+0000)
Subject: - up to 2.2b1:
X-Git-Tag: auto/th/cvsps-2_2-0_b1_1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcvsps.git;a=commitdiff_plain;h=2f1053df751fd131c8f01d69bdbf41ee6e02142b

- up to 2.2b1:
  - add a new line item in the PatchSet output which indicates which
    branches fork off from after this PatchSet.  This is actually
    the only way to correctly indicate the branching.  The 'Ancestor
    Branch' thing is actually broken by design, and is now deprecated.
  - sometimes cvs log has a timezone in it (from Ludwig Nussel)
  - better buffer size handling

Changed files:
    cvsps-fixes.patch -> 1.3
    cvsps.spec -> 1.13
---

diff --git a/cvsps-fixes.patch b/cvsps-fixes.patch
index 1cea6c7..1e08648 100644
--- a/cvsps-fixes.patch
+++ b/cvsps-fixes.patch
@@ -240,8 +240,8 @@
  .B \-A
  Show ancestor branch when a new branch is found.
  .TP
---- b/cvsps.c
-+++ b/cvsps.c	2011-01-31 08:14:42.846391432 +0200
+--- cvsps-2.2b1/cvsps.c~	2011-01-31 08:19:44.000000000 +0200
++++ cvsps-2.2b1/cvsps.c	2011-01-31 08:53:43.552797755 +0200
 @@ -39,7 +39,8 @@
  
  enum
@@ -263,7 +263,7 @@
  static CvsFileRevision * parse_revision(CvsFile * file, char * rev_str);
  static void assign_pre_revision(PatchSetMember *, CvsFileRevision * rev);
  static void check_print_patch_set(PatchSet *);
-@@ -260,12 +263,13 @@
+@@ -267,12 +267,13 @@
  {
      FILE * cvsfp;
      char buff[BUFSIZ];
@@ -271,7 +271,7 @@
 +    int state = NEED_RCS_FILE;
      CvsFile * file = NULL;
      PatchSetMember * psm = NULL;
-     char datebuff[20];
+     char datebuff[26];
      char authbuff[AUTH_STR_MAX];
 -    char logbuff[LOG_STR_MAX + 1];
 +    int logbufflen = LOG_STR_MAX + 1;
@@ -345,13 +345,14 @@
  	    }
  	    else
  	    {
-@@ -480,24 +506,22 @@
+@@ -509,25 +510,22 @@
  		 */
  		if (have_log || !is_revision_metadata(buff))
  		{
 -		    /* if the log buffer is full, that's it.  
 -		     * 
 -		     * Also, read lines (fgets) always have \n in them
+-		     * (unless truncation happens)
 -		     * which we count on.  So if truncation happens,
 -		     * be careful to put a \n on.
 -		     * 
diff --git a/cvsps.spec b/cvsps.spec
index 97a4eb7..4ff41ce 100644
--- a/cvsps.spec
+++ b/cvsps.spec
@@ -1,12 +1,14 @@
+%define		subver	b1
+%define		rel		1
 Summary:	Patchsets for CVS
 Summary(pl.UTF-8):	Zestawy łatek dla CVS
 Name:		cvsps
-Version:	2.1
-Release:	5
+Version:	2.2
+Release:	0.%{subver}.%{rel}
 License:	GPL
 Group:		Development/Version Control
-Source0:	http://www.cobite.com/cvsps/%{name}-%{version}.tar.gz
-# Source0-md5:	bde2110ed9f5d14de8f8cb04e9d596fe
+Source0:	http://www.cobite.com/cvsps/%{name}-%{version}%{subver}.tar.gz
+# Source0-md5:	997580e8e283034995b9209076858c68
 # Fixes made by git people, see:
 # http://ydirson.free.fr/en/software/scm/cvsps.html
 Patch0:		%{name}-fixes.patch
@@ -33,7 +35,7 @@ Choć CVS śledzi informacje o rewizjach, obejrzenie zmian wysłanych
 'atomowo' do repozytorium nie jest rzeczą łatwą.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{subver}
 %patch0 -p1
 
 %build
@@ -44,9 +46,8 @@ Choć CVS śledzi informacje o rewizjach, obejrzenie zmian wysłanych
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
-
-install cvsps $RPM_BUILD_ROOT%{_bindir}
-install cvsps.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -p cvsps $RPM_BUILD_ROOT%{_bindir}
+cp -a cvsps.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT